diff --git a/.github/workflows/check-qldoc.yml b/.github/workflows/check-qldoc.yml
new file mode 100644
index 00000000000..b2c6e889181
--- /dev/null
+++ b/.github/workflows/check-qldoc.yml
@@ -0,0 +1,50 @@
+name: "Check QLdoc coverage"
+
+on:
+  pull_request:
+    paths:
+      - "*/ql/lib/**"
+      - .github/workflows/check-qldoc.yml
+    branches:
+      - main
+      - "rc/*"
+
+jobs:
+  qldoc:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install CodeQL
+        run: |
+          gh extension install github/gh-codeql
+          gh codeql set-channel nightly
+          gh codeql version
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - name: Check QLdoc coverage
+        shell: bash
+        run: |
+          EXIT_CODE=0
+          changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -o '^[a-z]*/ql/lib' || true; } | sort -u)"
+          for pack_dir in ${changed_lib_packs}; do
+            lang="${pack_dir%/ql/lib}"
+            gh codeql generate library-doc-coverage --output="${RUNNER_TEMP}/${lang}-current.txt" --dir="${pack_dir}"
+          done
+          git checkout HEAD^
+          for pack_dir in ${changed_lib_packs}; do
+            lang="${pack_dir%/ql/lib}"
+            gh codeql generate library-doc-coverage --output="${RUNNER_TEMP}/${lang}-baseline.txt" --dir="${pack_dir}"
+            awk -F, '{gsub(/"/,""); if ($4==0 && $6=="public") print "\""$3"\"" }' "${RUNNER_TEMP}/${lang}-current.txt" | sort -u > "${RUNNER_TEMP}/current-undocumented.txt"
+            awk -F, '{gsub(/"/,""); if ($4==0 && $6=="public") print "\""$3"\"" }' "${RUNNER_TEMP}/${lang}-baseline.txt" | sort -u > "${RUNNER_TEMP}/baseline-undocumented.txt"
+            UNDOCUMENTED="$(grep -f <(comm -13 "${RUNNER_TEMP}/baseline-undocumented.txt" "${RUNNER_TEMP}/current-undocumented.txt") "${RUNNER_TEMP}/${lang}-current.txt" || true)"
+            if [ -n "$UNDOCUMENTED" ]; then
+              echo "$UNDOCUMENTED" | awk -F, '{gsub(/"/,""); print "::warning file='"${pack_dir}"'/"$1",line="$2"::Missing QLdoc for "$5, $3 }'
+              EXIT_CODE=1
+            fi
+          done
+          exit "${EXIT_CODE}"
diff --git a/config/blame-deprecations.mjs b/config/blame-deprecations.mjs
new file mode 100644
index 00000000000..82cc1f593c7
--- /dev/null
+++ b/config/blame-deprecations.mjs
@@ -0,0 +1,58 @@
+import fs from "fs";
+import path from "path";
+import cp from "child_process";
+function* walk(dir) {
+  for (const file of fs.readdirSync(dir)) {
+    const filePath = path.join(dir, file);
+    if (fs.statSync(filePath).isDirectory()) {
+      yield* walk(filePath);
+    } else {
+      yield filePath;
+    }
+  }
+}
+
+function* deprecatedFiles(dir) {
+  for (const file of walk(dir)) {
+    if (file.endsWith(".ql") || file.endsWith(".qll")) {
+      const contents = fs.readFileSync(file, "utf8");
+      if (/\sdeprecated\s/.test(contents)) {
+        yield file;
+      }
+    }
+  }
+}
+
+const blameRegExp =
+  /^(\^?\w+)\s.+\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (?:\+|-)\d{4})\s+(\d+)\).*$/;
+
+function* deprecationMessages(dir) {
+  for (const file of deprecatedFiles(dir)) {
+    const blame = cp.execFileSync("git", ["blame", "--", file]);
+    const lines = blame.toString().split("\n");
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (line.includes(" deprecated ")) {
+        try {
+          const [_, sha, time, lineNumber] = line.match(blameRegExp);
+          const date = new Date(time);
+          // check if it's within the last 14 months (a year, plus 2 months for safety, in case a PR was delayed)
+          if (date.getTime() >= Date.now() - 14 * 31 * 24 * 60 * 60 * 1000) {
+            continue;
+          }
+          const message = `${file}:${lineNumber} was last updated on ${date.getFullYear()}-${date.getMonth()}-${date.getDate()}`;
+          yield [message, date];
+        } catch (e) {
+          console.log(e);
+          console.log("----");
+          console.log(line);
+          console.log("----");
+          process.exit(0);
+        }
+      }
+    }
+  }
+}
+[...deprecationMessages(".")]
+  .sort((a, b) => a[1].getTime() - b[1].getTime())
+  .forEach((msg) => console.log(msg[0]));
diff --git a/config/identical-files.json b/config/identical-files.json
index daf764f15c6..ff4129d9776 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -73,6 +73,14 @@
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
   ],
+  "Model as Data Generation Java/C# - Utils": [
+    "java/ql/src/utils/model-generator/ModelGeneratorUtils.qll",
+    "csharp/ql/src/utils/model-generator/ModelGeneratorUtils.qll"
+  ],
+  "Model as Data Generation Java/C# - SummaryModels": [
+    "java/ql/src/utils/model-generator/CaptureSummaryModels.qll",
+    "csharp/ql/src/utils/model-generator/CaptureSummaryModels.qll"
+  ],
   "Sign Java/C#": [
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
@@ -426,7 +434,6 @@
     "python/ql/src/Lexical/CommentedOutCodeMetricOverview.inc.qhelp"
   ],
   "FLinesOfDuplicatedCodeCommon.inc.qhelp": [
-    "cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp",
     "java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp",
     "javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp",
     "python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp"
@@ -514,4 +521,4 @@
     "ruby/ql/src/queries/security/cwe-020/HostnameRegexpShared.qll",
     "python/ql/src/Security/CWE-020/HostnameRegexpShared.qll"
   ]
-}
+}
\ No newline at end of file
diff --git a/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/old.dbscheme b/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/old.dbscheme
new file mode 100644
index 00000000000..e9a518baf14
--- /dev/null
+++ b/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/old.dbscheme
@@ -0,0 +1,2096 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+/*
+  case @macroinvocations.kind of
+    1 = macro expansion
+  | 2 = other macro reference
+  ;
+*/
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+  case @function.kind of
+    1 = normal
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(int id: @function ref, unique int entry_point: @stmt ref);
+
+function_return_type(int id: @function ref, int return_type: @type ref);
+
+/** If `function` is a coroutine, then this gives the
+    std::experimental::resumable_traits instance associated with it,
+    and the variables representing the `handle` and `promise` for it. */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref,
+  int handle: @variable ref,
+  int promise: @variable ref
+);
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+member_function_this_type(unique int id: @function ref, int this_type: @type ref);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(int new: @function ref, int old: @function ref);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/*
+  Built-in types are the fundamental types, e.g., integral, floating, and void.
+
+  case @builtintype.kind of
+    1 = error
+  | 2 = unknown
+  | 3 = void
+  | 4 = boolean
+  | 5 = char
+  | 6 = unsigned_char
+  | 7 = signed_char
+  | 8 = short
+  | 9 = unsigned_short
+  | 10 = signed_short
+  | 11 = int
+  | 12 = unsigned_int
+  | 13 = signed_int
+  | 14 = long
+  | 15 = unsigned_long
+  | 16 = signed_long
+  | 17 = long_long
+  | 18 = unsigned_long_long
+  | 19 = signed_long_long
+  | 20 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+  case @usertype.kind of
+    1 = struct
+  | 2 = class
+  | 3 = union
+  | 4 = enum
+  | 5 = typedef                       // classic C: typedef typedef type name
+  | 6 = template
+  | 7 = template_parameter
+  | 8 = template_template_parameter
+  | 9 = proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+  | 13 = scoped_enum
+  | 14 = using_alias                  // a using name = type style typedef
+  ;
+*/
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the EDG frontend.  See symbol_ref.h there.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(unique int caller: @funbindexpr ref, int kind: int ref);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // EDG internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    unique int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/semmlecode.cpp.dbscheme b/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..bb0f279f2ac
--- /dev/null
+++ b/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/semmlecode.cpp.dbscheme
@@ -0,0 +1,2096 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+/*
+  case @macroinvocations.kind of
+    1 = macro expansion
+  | 2 = other macro reference
+  ;
+*/
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+  case @function.kind of
+    1 = normal
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(int id: @function ref, unique int entry_point: @stmt ref);
+
+function_return_type(int id: @function ref, int return_type: @type ref);
+
+/** If `function` is a coroutine, then this gives the
+    std::experimental::resumable_traits instance associated with it,
+    and the variables representing the `handle` and `promise` for it. */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref,
+  int handle: @variable ref,
+  int promise: @variable ref
+);
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+member_function_this_type(unique int id: @function ref, int this_type: @type ref);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(int new: @function ref, int old: @function ref);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/*
+  Built-in types are the fundamental types, e.g., integral, floating, and void.
+
+  case @builtintype.kind of
+    1 = error
+  | 2 = unknown
+  | 3 = void
+  | 4 = boolean
+  | 5 = char
+  | 6 = unsigned_char
+  | 7 = signed_char
+  | 8 = short
+  | 9 = unsigned_short
+  | 10 = signed_short
+  | 11 = int
+  | 12 = unsigned_int
+  | 13 = signed_int
+  | 14 = long
+  | 15 = unsigned_long
+  | 16 = signed_long
+  | 17 = long_long
+  | 18 = unsigned_long_long
+  | 19 = signed_long_long
+  | 20 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+  case @usertype.kind of
+    1 = struct
+  | 2 = class
+  | 3 = union
+  | 4 = enum
+  | 5 = typedef                       // classic C: typedef typedef type name
+  | 6 = template
+  | 7 = template_parameter
+  | 8 = template_template_parameter
+  | 9 = proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+  | 13 = scoped_enum
+  | 14 = using_alias                  // a using name = type style typedef
+  ;
+*/
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    unique string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the EDG frontend.  See symbol_ref.h there.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(unique int caller: @funbindexpr ref, int kind: int ref);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // EDG internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    unique int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/upgrade.properties b/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/upgrade.properties
new file mode 100644
index 00000000000..000fa581cfa
--- /dev/null
+++ b/cpp/downgrades/e9a518baf14f4322ac243578a8e1391386ff030f/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove uniqueness constraint from the uuid property
+compatibility: full
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index abf6a3e48e7..d4603cef8b4 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.0.11
+
+### Minor Analysis Improvements
+
+* Many queries now support structured bindings, as structured bindings are now handled in the IR translation.
+
 ## 0.0.10
 
 ### New Features
@@ -6,6 +12,7 @@
 
 ## 0.0.9
 
+
 ## 0.0.8
 
 ### Deprecated APIs
diff --git a/cpp/ql/lib/DefaultOptions.qll b/cpp/ql/lib/DefaultOptions.qll
index ae3ca205188..73a891bb554 100644
--- a/cpp/ql/lib/DefaultOptions.qll
+++ b/cpp/ql/lib/DefaultOptions.qll
@@ -54,11 +54,13 @@ class Options extends string {
    *
    * By default, this holds for `exit`, `_exit`, `abort`, `__assert_fail`,
    * `longjmp`, `__builtin_unreachable` and any function with a
-   * `noreturn` attribute.
+   * `noreturn` attribute or specifier.
    */
   predicate exits(Function f) {
     f.getAnAttribute().hasName("noreturn")
     or
+    f.getASpecifier().hasName("noreturn")
+    or
     f.hasGlobalOrStdName([
         "exit", "_exit", "abort", "__assert_fail", "longjmp", "__builtin_unreachable"
       ])
diff --git a/cpp/ql/lib/Options.qll b/cpp/ql/lib/Options.qll
index b18aede94f2..a0a13881a94 100644
--- a/cpp/ql/lib/Options.qll
+++ b/cpp/ql/lib/Options.qll
@@ -39,7 +39,7 @@ class CustomOptions extends Options {
    *
    * By default, this holds for `exit`, `_exit`, `abort`, `__assert_fail`,
    * `longjmp`, `error`, `__builtin_unreachable` and any function with a
-   * `noreturn` attribute.
+   * `noreturn` attribute or specifier.
    */
   override predicate exits(Function f) { Options.super.exits(f) }
 
diff --git a/cpp/ql/lib/change-notes/2022-02-07-deleted-deprecations.md b/cpp/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
new file mode 100644
index 00000000000..e8da1e8e158
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* All deprecated predicates/classes/modules that have been deprecated for over a year have been deleted.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md b/cpp/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
new file mode 100644
index 00000000000..a79f286aacd
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2022-03-10-template-implicit-copy.md b/cpp/ql/lib/change-notes/2022-03-10-template-implicit-copy.md
new file mode 100644
index 00000000000..fe2afba6568
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2022-03-10-template-implicit-copy.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* `hasImplicitCopyConstructor` and `hasImplicitCopyAssignmentOperator` now correctly handle implicitly-deleted operators in templates.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2022-03-14-c11-noreturn.md b/cpp/ql/lib/change-notes/2022-03-14-c11-noreturn.md
new file mode 100644
index 00000000000..c74e1ab9820
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2022-03-14-c11-noreturn.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* `DefaultOptions::exits` now holds for C11 functions with the `_Noreturn` or `noreturn` specifier.
diff --git a/cpp/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md b/cpp/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
new file mode 100644
index 00000000000..3481d507db3
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The flow state variants of `isBarrier` and `isAdditionalFlowStep` are no longer exposed in the taint tracking library. The `isSanitizer` and `isAdditionalTaintStep` predicates should be used instead.
diff --git a/cpp/ql/lib/change-notes/2022-02-24-structured-bindings-in-ir.md b/cpp/ql/lib/change-notes/released/0.0.11.md
similarity index 71%
rename from cpp/ql/lib/change-notes/2022-02-24-structured-bindings-in-ir.md
rename to cpp/ql/lib/change-notes/released/0.0.11.md
index debfa99a782..633eca26993 100644
--- a/cpp/ql/lib/change-notes/2022-02-24-structured-bindings-in-ir.md
+++ b/cpp/ql/lib/change-notes/released/0.0.11.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 0.0.11
+
+### Minor Analysis Improvements
+
 * Many queries now support structured bindings, as structured bindings are now handled in the IR translation.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index a989c9a6c9d..0a29f7b86ba 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -69,6 +69,4 @@ import semmle.code.cpp.Comments
 import semmle.code.cpp.Preprocessor
 import semmle.code.cpp.Iteration
 import semmle.code.cpp.NameQualifiers
-import semmle.code.cpp.ObjectiveC
-import semmle.code.cpp.exprs.ObjectiveC
 import DefaultOptions
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index fe2ce10e49b..f76e7c23f6f 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Class.qll b/cpp/ql/lib/semmle/code/cpp/Class.qll
index 64819a5e945..a91cedb9a0b 100644
--- a/cpp/ql/lib/semmle/code/cpp/Class.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Class.qll
@@ -111,24 +111,6 @@ class Class extends UserType {
     result = this.getCanonicalMember(index).(TemplateVariable).getAnInstantiation()
   }
 
-  /**
-   * DEPRECATED: Use `getCanonicalMember(int)` or `getAMember(int)` instead.
-   * Gets the `index`th member of this class.
-   */
-  deprecated Declaration getMember(int index) {
-    member(underlyingElement(this), index, unresolveElement(result))
-  }
-
-  /**
-   * DEPRECATED: As this includes a somewhat arbitrary number of
-   *             template instantiations, it is unlikely to do what
-   *             you need.
-   * Gets the number of members that this class has. This includes both
-   * templates that are in this class, and instantiations of those
-   * templates.
-   */
-  deprecated int getNumMember() { result = count(this.getAMember()) }
-
   /**
    * Gets a private member declared in this class, struct or union.
    * For template members, this may be either the template or an
@@ -208,23 +190,6 @@ class Class extends UserType {
    */
   deprecated predicate hasCopyConstructor() { this.getAMemberFunction() instanceof CopyConstructor }
 
-  /**
-   * Holds if this class has a copy assignment operator that is either
-   * explicitly declared (though possibly `= delete`) or is auto-generated,
-   * non-trivial and called from somewhere.
-   *
-   * DEPRECATED: There is more than one reasonable definition of what it means
-   * to have a copy assignment operator, and we do not want to promote one
-   * particular definition by naming it with this predicate. Having a copy
-   * assignment operator could mean that such a member is declared or defined
-   * in the source or that it is callable by a particular caller. For C++11,
-   * there's also a question of whether to include members that are defaulted
-   * or deleted.
-   */
-  deprecated predicate hasCopyAssignmentOperator() {
-    this.getAMemberFunction() instanceof CopyAssignmentOperator
-  }
-
   /**
    * Like accessOfBaseMember but returns multiple results if there are multiple
    * paths to `base` through the inheritance graph.
@@ -286,6 +251,16 @@ class Class extends UserType {
     not this.implicitCopyConstructorDeleted() and
     forall(CopyConstructor cc | cc = this.getAMemberFunction() |
       cc.isCompilerGenerated() and not cc.isDeleted()
+    ) and
+    (
+      not this instanceof ClassTemplateInstantiation
+      or
+      this.(ClassTemplateInstantiation).getTemplate().hasImplicitCopyConstructor()
+    ) and
+    (
+      not this instanceof PartialClassTemplateSpecialization
+      or
+      this.(PartialClassTemplateSpecialization).getPrimaryTemplate().hasImplicitCopyConstructor()
     )
   }
 
@@ -301,6 +276,18 @@ class Class extends UserType {
     not this.implicitCopyAssignmentOperatorDeleted() and
     forall(CopyAssignmentOperator ca | ca = this.getAMemberFunction() |
       ca.isCompilerGenerated() and not ca.isDeleted()
+    ) and
+    (
+      not this instanceof ClassTemplateInstantiation
+      or
+      this.(ClassTemplateInstantiation).getTemplate().hasImplicitCopyAssignmentOperator()
+    ) and
+    (
+      not this instanceof PartialClassTemplateSpecialization
+      or
+      this.(PartialClassTemplateSpecialization)
+          .getPrimaryTemplate()
+          .hasImplicitCopyAssignmentOperator()
     )
   }
 
@@ -1070,31 +1057,6 @@ class PartialClassTemplateSpecialization extends ClassTemplateSpecialization {
   override string getAPrimaryQlClass() { result = "PartialClassTemplateSpecialization" }
 }
 
-/**
- * An "interface" is a class that only contains pure virtual functions (and contains
- * at least one such function).  For example:
- * ```
- * class MyInterfaceClass {
- * public:
- *   virtual void myMethod1() = 0;
- *   virtual void myMethod2() = 0;
- * };
- * ```
- *
- * DEPRECATED: This class is considered to be too specific for general usage.
- */
-deprecated class Interface extends Class {
-  Interface() {
-    forex(Declaration m |
-      m.getDeclaringType() = this.getABaseClass*() and not compgenerated(unresolveElement(m))
-    |
-      m instanceof PureVirtualFunction
-    )
-  }
-
-  override string getAPrimaryQlClass() { result = "Interface" }
-}
-
 /**
  * A class/struct derivation that is virtual.  For example the derivation in
  * the following code is a `VirtualClassDerivation`:
diff --git a/cpp/ql/lib/semmle/code/cpp/Element.qll b/cpp/ql/lib/semmle/code/cpp/Element.qll
index 9273d1b31bf..a1afd61ded1 100644
--- a/cpp/ql/lib/semmle/code/cpp/Element.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Element.qll
@@ -55,9 +55,6 @@ class ElementBase extends @element {
   cached
   string toString() { none() }
 
-  /** DEPRECATED: use `getAPrimaryQlClass` instead. */
-  deprecated string getCanonicalQLClass() { result = this.getAPrimaryQlClass() }
-
   /**
    * Gets a comma-separated list of the names of the primary CodeQL classes to which this element belongs.
    */
@@ -91,13 +88,6 @@ class Element extends ElementBase {
    */
   predicate fromSource() { this.getFile().fromSource() }
 
-  /**
-   * Holds if this element may be from a library.
-   *
-   * DEPRECATED: always true.
-   */
-  deprecated predicate fromLibrary() { this.getFile().fromLibrary() }
-
   /** Gets the primary location of this element. */
   Location getLocation() { none() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/File.qll b/cpp/ql/lib/semmle/code/cpp/File.qll
index 3b72533b4f4..398633edbd8 100644
--- a/cpp/ql/lib/semmle/code/cpp/File.qll
+++ b/cpp/ql/lib/semmle/code/cpp/File.qll
@@ -196,31 +196,11 @@ class Folder extends Container, @folder {
    */
   deprecated string getName() { folders(underlyingElement(this), result) }
 
-  /**
-   * DEPRECATED: use `getAbsolutePath` instead.
-   * Holds if this element is named `name`.
-   */
-  deprecated predicate hasName(string name) { name = this.getName() }
-
-  /**
-   * DEPRECATED: use `getAbsolutePath` instead.
-   * Gets the full name of this folder.
-   */
-  deprecated string getFullName() { result = this.getName() }
-
   /**
    * DEPRECATED: use `getBaseName` instead.
    * Gets the last part of the folder name.
    */
   deprecated string getShortName() { result = this.getBaseName() }
-
-  /**
-   * DEPRECATED: use `getParentContainer` instead.
-   * Gets the parent folder.
-   */
-  deprecated Folder getParent() {
-    containerparent(unresolveElement(result), underlyingElement(this))
-  }
 }
 
 /**
@@ -308,13 +288,6 @@ class File extends Container, @file {
    */
   override predicate fromSource() { numlines(underlyingElement(this), _, _, _) }
 
-  /**
-   * Holds if this file may be from a library.
-   *
-   * DEPRECATED: For historical reasons this is true for any file.
-   */
-  deprecated override predicate fromLibrary() { any() }
-
   /** Gets the metric file. */
   MetricFile getMetrics() { result = this }
 
@@ -428,25 +401,3 @@ class CppFile extends File {
 
   override string getAPrimaryQlClass() { result = "CppFile" }
 }
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C source file, as determined by file extension.
- *
- * For the related notion of whether a file is compiled as Objective C
- * code, use `File.compiledAsObjC`.
- */
-deprecated class ObjCFile extends File {
-  ObjCFile() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C++ source file, as determined by file extension.
- *
- * For the related notion of whether a file is compiled as Objective C++
- * code, use `File.compiledAsObjCpp`.
- */
-deprecated class ObjCppFile extends File {
-  ObjCppFile() { none() }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/Location.qll b/cpp/ql/lib/semmle/code/cpp/Location.qll
index 92b358d474c..cef6482496b 100644
--- a/cpp/ql/lib/semmle/code/cpp/Location.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Location.qll
@@ -105,25 +105,6 @@ class Location extends @location {
   }
 }
 
-/**
- * DEPRECATED: Use `Location` instead.
- * A location of an element. Not used for expressions or statements, which
- * instead use LocationExpr and LocationStmt respectively.
- */
-deprecated library class LocationDefault extends Location, @location_default { }
-
-/**
- * DEPRECATED: Use `Location` instead.
- * A location of a statement.
- */
-deprecated library class LocationStmt extends Location, @location_stmt { }
-
-/**
- * DEPRECATED: Use `Location` instead.
- * A location of an expression.
- */
-deprecated library class LocationExpr extends Location, @location_expr { }
-
 /**
  * Gets the length of the longest line in file `f`.
  */
diff --git a/cpp/ql/lib/semmle/code/cpp/Macro.qll b/cpp/ql/lib/semmle/code/cpp/Macro.qll
index 6d61ae7be7c..4378cec4857 100644
--- a/cpp/ql/lib/semmle/code/cpp/Macro.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Macro.qll
@@ -30,16 +30,6 @@ class Macro extends PreprocessorDirective, @ppd_define {
     else result = "#define " + this.getHead() + " " + this.getBody()
   }
 
-  /**
-   * Holds if the body of the macro starts with an unmatched closing
-   * parenthesis. For example:
-   *
-   *   #define RPAREN() )
-   *
-   * DEPRECATED: This predicate has a misleading name.
-   */
-  deprecated predicate isFunctionLike() { this.getBody().regexpMatch("[^(]*\\).*") }
-
   /**
    * Gets the name of the macro.  For example, `MAX` in
    * `#define MAX(x,y) (((x)>(y))?(x):(y))`.
@@ -261,46 +251,6 @@ class MacroInvocation extends MacroAccess {
   string getExpandedArgument(int i) { macro_argument_expanded(underlyingElement(this), i, result) }
 }
 
-/**
- * A top-level expression generated by a macro invocation.
- *
- * DEPRECATED: Use `MacroInvocation.getExpr()` directly to get an
- * expression generated at the top-level of a macro invocation.  Use
- * `MacroInvocation.getAnAffectedElement()` to get any element generated
- * by a macro invocation.
- */
-deprecated class MacroInvocationExpr extends Expr {
-  MacroInvocationExpr() { exists(MacroInvocation i | this = i.getExpr()) }
-
-  /**
-   * Gets the macro invocation of which this is the top-level expression.
-   */
-  MacroInvocation getInvocation() { result.getExpr() = this }
-
-  /** Gets the name of the invoked macro. */
-  string getMacroName() { result = this.getInvocation().getMacroName() }
-}
-
-/**
- * A top-level statement generated by a macro invocation.
- *
- * DEPRECATED: Use `MacroInvocation.getStmt()` directly to get a
- * statement generated at the top-level of a macro invocation.  Use
- * `MacroInvocation.getAnAffectedElement()` to get any element generated
- * by a macro invocation.
- */
-deprecated class MacroInvocationStmt extends Stmt {
-  MacroInvocationStmt() { exists(MacroInvocation i | this = i.getStmt()) }
-
-  /**
-   * Gets the macro invocation of which this is the top-level statement.
-   */
-  MacroInvocation getInvocation() { result.getStmt() = this }
-
-  /** Gets the name of the invoked macro. */
-  string getMacroName() { result = this.getInvocation().getMacroName() }
-}
-
 /** Holds if `l` is the location of a macro. */
 predicate macroLocation(Location l) { macrolocationbind(_, l) }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/MemberFunction.qll b/cpp/ql/lib/semmle/code/cpp/MemberFunction.qll
index 03b1704549f..6243104c2a3 100644
--- a/cpp/ql/lib/semmle/code/cpp/MemberFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/MemberFunction.qll
@@ -233,40 +233,6 @@ class ImplicitConversionFunction extends MemberFunction {
   Type getDestType() { none() } // overridden in subclasses
 }
 
-/**
- * DEPRECATED: as of C++11 this class does not correspond perfectly with the
- * language definition of a converting constructor.
- *
- * A C++ constructor that also defines an implicit conversion. For example the
- * function `MyClass` in the following code is a `ConversionConstructor`:
- * ```
- * class MyClass {
- * public:
- *   MyClass(const MyOtherClass &from) {
- *     ...
- *   }
- * };
- * ```
- */
-deprecated class ConversionConstructor extends Constructor, ImplicitConversionFunction {
-  ConversionConstructor() {
-    strictcount(Parameter p | p = this.getAParameter() and not p.hasInitializer()) = 1 and
-    not this.hasSpecifier("explicit")
-  }
-
-  override string getAPrimaryQlClass() {
-    not this instanceof CopyConstructor and
-    not this instanceof MoveConstructor and
-    result = "ConversionConstructor"
-  }
-
-  /** Gets the type this `ConversionConstructor` takes as input. */
-  override Type getSourceType() { result = this.getParameter(0).getType() }
-
-  /** Gets the type this `ConversionConstructor` is a constructor of. */
-  override Type getDestType() { result = this.getDeclaringType() }
-}
-
 private predicate hasCopySignature(MemberFunction f) {
   f.getParameter(0).getUnspecifiedType().(LValueReferenceType).getBaseType() = f.getDeclaringType()
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/Namespace.qll b/cpp/ql/lib/semmle/code/cpp/Namespace.qll
index 47ebc9d35c5..129e1449c32 100644
--- a/cpp/ql/lib/semmle/code/cpp/Namespace.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Namespace.qll
@@ -86,13 +86,6 @@ class Namespace extends NameQualifyingElement, @namespace {
   /** Holds if this namespace may be from source. */
   override predicate fromSource() { this.getADeclaration().fromSource() }
 
-  /**
-   * Holds if this namespace is in a library.
-   *
-   * DEPRECATED: never holds.
-   */
-  deprecated override predicate fromLibrary() { not this.fromSource() }
-
   /** Gets the metric namespace. */
   MetricNamespace getMetrics() { result = this }
 
@@ -233,11 +226,6 @@ class GlobalNamespace extends Namespace {
 
   override Namespace getParentNamespace() { none() }
 
-  /**
-   * DEPRECATED: use `getName()`.
-   */
-  deprecated string getFullName() { result = this.getName() }
-
   override string getFriendlyName() { result = "(global namespace)" }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ObjectiveC.qll b/cpp/ql/lib/semmle/code/cpp/ObjectiveC.qll
deleted file mode 100644
index 17da273d5a7..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ObjectiveC.qll
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * DEPRECATED: Objective-C is no longer supported.
- */
-
-import semmle.code.cpp.Class
-private import semmle.code.cpp.internal.ResolveClass
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C class.
- */
-deprecated class ObjectiveClass extends Class {
-  ObjectiveClass() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C protocol.
- */
-deprecated class Protocol extends Class {
-  Protocol() { none() }
-
-  /**
-   * Holds if the type implements the protocol, either because the type
-   * itself does, or because it is a type conforming to the protocol.
-   */
-  predicate isImplementedBy(Type t) { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * A type which conforms to a protocol. Use `getAProtocol` to get a
- * protocol that this type conforms to.
- */
-deprecated class TypeConformingToProtocol extends DerivedType {
-  TypeConformingToProtocol() { none() }
-
-  /** Gets a protocol that this type conforms to. */
-  Protocol getAProtocol() { none() }
-
-  /** Gets the size of this type. */
-  override int getSize() { none() }
-
-  override int getAlignment() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@autoreleasepool` statement, for example
- * `@autoreleasepool { int x; int y; }`.
- */
-deprecated class AutoReleasePoolStmt extends Stmt {
-  AutoReleasePoolStmt() { none() }
-
-  override string toString() { none() }
-
-  /** Gets the body statement of this `@autoreleasepool` statement. */
-  Stmt getStmt() { none() }
-
-  override predicate mayBeImpure() { none() }
-
-  override predicate mayBeGloballyImpure() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@synchronized statement`, for example
- * `@synchronized (x) { [x complicationOperation]; }`.
- */
-deprecated class SynchronizedStmt extends Stmt {
-  SynchronizedStmt() { none() }
-
-  override string toString() { none() }
-
-  /** Gets the expression which gives the object to be locked. */
-  Expr getLockedObject() { none() }
-
-  /** Gets the body statement of this `@synchronized` statement. */
-  Stmt getStmt() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C for-in statement.
- */
-deprecated class ForInStmt extends Loop {
-  ForInStmt() { none() }
-
-  /**
-   * Gets the condition expression of the `while` statement that the
-   * `for...in` statement desugars into.
-   */
-  override Expr getCondition() { none() }
-
-  override Expr getControllingExpr() { none() }
-
-  /** Gets the collection that the loop iterates over. */
-  Expr getCollection() { none() }
-
-  /** Gets the body of the loop. */
-  override Stmt getStmt() { none() }
-
-  override string toString() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C category or class extension.
- */
-deprecated class Category extends Class {
-  Category() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C class extension.
- */
-deprecated class ClassExtension extends Category {
-  ClassExtension() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C try statement.
- */
-deprecated class ObjcTryStmt extends TryStmt {
-  ObjcTryStmt() { none() }
-
-  override string toString() { none() }
-
-  /** Gets the finally clause of this try statement, if any. */
-  FinallyBlock getFinallyClause() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@finally` block.
- */
-deprecated class FinallyBlock extends BlockStmt {
-  FinallyBlock() { none() }
-
-  /** Gets the try statement corresponding to this finally block. */
-  ObjcTryStmt getTryStmt() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@property`.
- */
-deprecated class Property extends Declaration {
-  Property() { none() }
-
-  /** Gets the name of this property. */
-  override string getName() { none() }
-
-  /**
-   * Gets nothing (provided for compatibility with Declaration).
-   *
-   * For the attribute list following the `@property` keyword, use
-   * `getAnAttribute()`.
-   */
-  override Specifier getASpecifier() { none() }
-
-  /**
-   * Gets an attribute of this property (such as `readonly`, `nonatomic`,
-   * or `getter=isEnabled`).
-   */
-  Attribute getAnAttribute() { none() }
-
-  override Location getADeclarationLocation() { result = getLocation() }
-
-  override Location getDefinitionLocation() { result = getLocation() }
-
-  override Location getLocation() { none() }
-
-  /** Gets the type of this property. */
-  Type getType() { none() }
-
-  /**
-   * Gets the instance method which is called to get the value of this
-   * property.
-   */
-  MemberFunction getGetter() { none() }
-
-  /**
-   * Gets the instance method which is called to set the value of this
-   * property (if it is a writable property).
-   */
-  MemberFunction getSetter() { none() }
-
-  /**
-   * Gets the instance variable which stores the property value (if this
-   * property was explicitly or automatically `@synthesize`d).
-   */
-  MemberVariable getInstanceVariable() { none() }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/Parameter.qll b/cpp/ql/lib/semmle/code/cpp/Parameter.qll
index 47b77b542c1..814fa734408 100644
--- a/cpp/ql/lib/semmle/code/cpp/Parameter.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Parameter.qll
@@ -95,22 +95,6 @@ class Parameter extends LocalScopeVariable, @parameter {
     else result = this.getADeclarationEntry()
   }
 
-  /**
-   * Gets the name of this parameter in the given block (which should be
-   * the body of a function with which the parameter is associated).
-   *
-   * DEPRECATED: this method was used in a previous implementation of
-   * getName, but is no longer in use.
-   */
-  deprecated string getNameInBlock(BlockStmt b) {
-    exists(ParameterDeclarationEntry pde |
-      pde.getFunctionDeclarationEntry().getBlock() = b and
-      this.getFunction().getBlock() = b and
-      pde.getVariable() = this and
-      result = pde.getName()
-    )
-  }
-
   /**
    * Holds if this parameter has a name.
    *
diff --git a/cpp/ql/lib/semmle/code/cpp/Print.qll b/cpp/ql/lib/semmle/code/cpp/Print.qll
index 64ae5b960d1..5df8f087689 100644
--- a/cpp/ql/lib/semmle/code/cpp/Print.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Print.qll
@@ -8,9 +8,9 @@ private import PrintAST
 private predicate shouldPrintDeclaration(Declaration decl) {
   not decl instanceof Function
   or
-  not exists(PrintASTConfiguration c)
+  not exists(PrintAstConfiguration c)
   or
-  exists(PrintASTConfiguration config | config.shouldPrintFunction(decl))
+  exists(PrintAstConfiguration config | config.shouldPrintFunction(decl))
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/PrintAST.ql b/cpp/ql/lib/semmle/code/cpp/PrintAST.ql
index e4c53030da5..bf7e345132c 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.ql
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.ql
@@ -12,7 +12,7 @@ import PrintAST
  * Temporarily tweak this class or make a copy to control which functions are
  * printed.
  */
-class Cfg extends PrintASTConfiguration {
+class Cfg extends PrintAstConfiguration {
   /**
    * TWEAK THIS PREDICATE AS NEEDED.
    * Holds if the AST for `func` should be printed.
diff --git a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
index 86b39a285b0..7658d5cf17a 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
@@ -9,12 +9,12 @@
 import cpp
 private import semmle.code.cpp.Print
 
-private newtype TPrintASTConfiguration = MkPrintASTConfiguration()
+private newtype TPrintAstConfiguration = MkPrintAstConfiguration()
 
 /**
  * The query can extend this class to control which functions are printed.
  */
-class PrintASTConfiguration extends TPrintASTConfiguration {
+class PrintAstConfiguration extends TPrintAstConfiguration {
   /**
    * Gets a textual representation of this `PrintASTConfiguration`.
    */
@@ -27,8 +27,11 @@ class PrintASTConfiguration extends TPrintASTConfiguration {
   predicate shouldPrintFunction(Function func) { any() }
 }
 
+/** DEPRECATED: Alias for PrintAstConfiguration */
+deprecated class PrintASTConfiguration = PrintAstConfiguration;
+
 private predicate shouldPrintFunction(Function func) {
-  exists(PrintASTConfiguration config | config.shouldPrintFunction(func))
+  exists(PrintAstConfiguration config | config.shouldPrintFunction(func))
 }
 
 bindingset[s]
@@ -85,8 +88,8 @@ private Function getEnclosingFunction(Locatable ast) {
  * Most nodes are just a wrapper around `Locatable`, but we do synthesize new
  * nodes for things like parameter lists and constructor init lists.
  */
-private newtype TPrintASTNode =
-  TASTNode(Locatable ast) { shouldPrintFunction(getEnclosingFunction(ast)) } or
+private newtype TPrintAstNode =
+  TAstNode(Locatable ast) { shouldPrintFunction(getEnclosingFunction(ast)) } or
   TDeclarationEntryNode(DeclStmt stmt, DeclarationEntry entry) {
     // We create a unique node for each pair of (stmt, entry), to avoid having one node with
     // multiple parents due to extractor bug CPP-413.
@@ -106,7 +109,7 @@ private newtype TPrintASTNode =
 /**
  * A node in the output tree.
  */
-class PrintASTNode extends TPrintASTNode {
+class PrintAstNode extends TPrintAstNode {
   /**
    * Gets a textual representation of this node in the PrintAST output tree.
    */
@@ -116,17 +119,17 @@ class PrintASTNode extends TPrintASTNode {
    * Gets the child node at index `childIndex`. Child indices must be unique,
    * but need not be contiguous.
    */
-  abstract PrintASTNode getChildInternal(int childIndex);
+  abstract PrintAstNode getChildInternal(int childIndex);
 
   /**
    * Gets the child node at index `childIndex`.
    * Adds edges to fully converted expressions, that are not part of the
    * regular parent/child relation traversal.
    */
-  final PrintASTNode getChild(int childIndex) {
+  final PrintAstNode getChild(int childIndex) {
     // The exact value of `childIndex` doesn't matter, as long as we preserve the correct order.
     result =
-      rank[childIndex](PrintASTNode child, int nonConvertedIndex, boolean isConverted |
+      rank[childIndex](PrintAstNode child, int nonConvertedIndex, boolean isConverted |
         childAndAccessorPredicate(child, _, nonConvertedIndex, isConverted)
       |
         // Unconverted children come first, then sort by original child index within each group.
@@ -138,11 +141,11 @@ class PrintASTNode extends TPrintASTNode {
    * Gets the node for the `.getFullyConverted()` version of the child originally at index
    * `childIndex`, if that node has any conversions.
    */
-  private PrintASTNode getConvertedChild(int childIndex) {
+  private PrintAstNode getConvertedChild(int childIndex) {
     exists(Expr expr |
-      expr = getChildInternal(childIndex).(ASTNode).getAST() and
+      expr = getChildInternal(childIndex).(AstNode).getAst() and
       expr.getFullyConverted() instanceof Conversion and
-      result.(ASTNode).getAST() = expr.getFullyConverted() and
+      result.(AstNode).getAst() = expr.getFullyConverted() and
       not expr instanceof Conversion
     )
   }
@@ -166,12 +169,12 @@ class PrintASTNode extends TPrintASTNode {
   /**
    * Gets the children of this node.
    */
-  final PrintASTNode getAChild() { result = getChild(_) }
+  final PrintAstNode getAChild() { result = getChild(_) }
 
   /**
    * Gets the parent of this node, if any.
    */
-  final PrintASTNode getParent() { result.getAChild() = this }
+  final PrintAstNode getParent() { result.getAChild() = this }
 
   /**
    * Gets the location of this node in the source code.
@@ -196,7 +199,7 @@ class PrintASTNode extends TPrintASTNode {
    * one result tuple, with `isConverted = false`.
    */
   private predicate childAndAccessorPredicate(
-    PrintASTNode child, string childPredicate, int nonConvertedIndex, boolean isConverted
+    PrintAstNode child, string childPredicate, int nonConvertedIndex, boolean isConverted
   ) {
     child = getChildInternal(nonConvertedIndex) and
     childPredicate = getChildAccessorPredicateInternal(nonConvertedIndex) and
@@ -234,12 +237,15 @@ class PrintASTNode extends TPrintASTNode {
   private Function getEnclosingFunction() { result = getParent*().(FunctionNode).getFunction() }
 }
 
+/** DEPRECATED: Alias for PrintAstNode */
+deprecated class PrintASTNode = PrintAstNode;
+
 /**
  * Class that restricts the elements that we compute `qlClass` for.
  */
 private class PrintableElement extends Element {
   PrintableElement() {
-    exists(TASTNode(this))
+    exists(TAstNode(this))
     or
     exists(TDeclarationEntryNode(_, this))
     or
@@ -262,7 +268,7 @@ private string qlClass(PrintableElement el) {
 /**
  * A node representing an AST node.
  */
-abstract class BaseASTNode extends PrintASTNode {
+abstract class BaseAstNode extends PrintAstNode {
   Locatable ast;
 
   override string toString() { result = qlClass(ast) + ast.toString() }
@@ -272,25 +278,34 @@ abstract class BaseASTNode extends PrintASTNode {
   /**
    * Gets the AST represented by this node.
    */
-  final Locatable getAST() { result = ast }
+  final Locatable getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Locatable getAST() { result = getAst() }
 }
 
+/** DEPRECATED: Alias for BaseAstNode */
+deprecated class BaseASTNode = BaseAstNode;
+
 /**
  * A node representing an AST node other than a `DeclarationEntry`.
  */
-abstract class ASTNode extends BaseASTNode, TASTNode {
-  ASTNode() { this = TASTNode(ast) }
+abstract class AstNode extends BaseAstNode, TAstNode {
+  AstNode() { this = TAstNode(ast) }
 }
 
+/** DEPRECATED: Alias for AstNode */
+deprecated class ASTNode = AstNode;
+
 /**
  * A node representing an `Expr`.
  */
-class ExprNode extends ASTNode {
+class ExprNode extends AstNode {
   Expr expr;
 
   ExprNode() { expr = ast }
 
-  override ASTNode getChildInternal(int childIndex) { result.getAST() = expr.getChild(childIndex) }
+  override AstNode getChildInternal(int childIndex) { result.getAst() = expr.getChild(childIndex) }
 
   override string getProperty(string key) {
     result = super.getProperty(key)
@@ -306,7 +321,7 @@ class ExprNode extends ASTNode {
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
-    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAST())
+    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAst())
   }
 
   /**
@@ -334,9 +349,9 @@ class ConversionNode extends ExprNode {
 
   ConversionNode() { conv = expr }
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = conv.getExpr() and
+    result.getAst() = conv.getExpr() and
     conv.getExpr() instanceof Conversion
   }
 }
@@ -363,27 +378,27 @@ class CastNode extends ConversionNode {
 class StmtExprNode extends ExprNode {
   override StmtExpr expr;
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = expr.getStmt()
+    result.getAst() = expr.getStmt()
   }
 }
 
 /**
  * A node representing a `DeclarationEntry`.
  */
-class DeclarationEntryNode extends BaseASTNode, TDeclarationEntryNode {
+class DeclarationEntryNode extends BaseAstNode, TDeclarationEntryNode {
   override DeclarationEntry ast;
   DeclStmt declStmt;
 
   DeclarationEntryNode() { this = TDeclarationEntryNode(declStmt, ast) }
 
-  override PrintASTNode getChildInternal(int childIndex) { none() }
+  override PrintAstNode getChildInternal(int childIndex) { none() }
 
   override string getChildAccessorPredicateInternal(int childIndex) { none() }
 
   override string getProperty(string key) {
-    result = BaseASTNode.super.getProperty(key)
+    result = BaseAstNode.super.getProperty(key)
     or
     key = "Type" and
     result = qlClass(ast.getType()) + ast.getType().toString()
@@ -396,9 +411,9 @@ class DeclarationEntryNode extends BaseASTNode, TDeclarationEntryNode {
 class VariableDeclarationEntryNode extends DeclarationEntryNode {
   override VariableDeclarationEntry ast;
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = ast.getVariable().getInitializer()
+    result.getAst() = ast.getVariable().getInitializer()
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
@@ -410,23 +425,23 @@ class VariableDeclarationEntryNode extends DeclarationEntryNode {
 /**
  * A node representing a `Stmt`.
  */
-class StmtNode extends ASTNode {
+class StmtNode extends AstNode {
   Stmt stmt;
 
   StmtNode() { stmt = ast }
 
-  override BaseASTNode getChildInternal(int childIndex) {
+  override BaseAstNode getChildInternal(int childIndex) {
     exists(Locatable child |
       child = stmt.getChild(childIndex) and
       (
-        result.getAST() = child.(Expr) or
-        result.getAST() = child.(Stmt)
+        result.getAst() = child.(Expr) or
+        result.getAst() = child.(Stmt)
       )
     )
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
-    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAST())
+    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAst())
   }
 }
 
@@ -449,12 +464,12 @@ class DeclStmtNode extends StmtNode {
 /**
  * A node representing a `Parameter`.
  */
-class ParameterNode extends ASTNode {
+class ParameterNode extends AstNode {
   Parameter param;
 
   ParameterNode() { param = ast }
 
-  final override PrintASTNode getChildInternal(int childIndex) { none() }
+  final override PrintAstNode getChildInternal(int childIndex) { none() }
 
   final override string getChildAccessorPredicateInternal(int childIndex) { none() }
 
@@ -469,14 +484,14 @@ class ParameterNode extends ASTNode {
 /**
  * A node representing an `Initializer`.
  */
-class InitializerNode extends ASTNode {
+class InitializerNode extends AstNode {
   Initializer init;
 
   InitializerNode() { init = ast }
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = init.getExpr()
+    result.getAst() = init.getExpr()
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
@@ -488,7 +503,7 @@ class InitializerNode extends ASTNode {
 /**
  * A node representing the parameters of a `Function`.
  */
-class ParametersNode extends PrintASTNode, TParametersNode {
+class ParametersNode extends PrintAstNode, TParametersNode {
   Function func;
 
   ParametersNode() { this = TParametersNode(func) }
@@ -497,8 +512,8 @@ class ParametersNode extends PrintASTNode, TParametersNode {
 
   final override Location getLocation() { result = getRepresentativeLocation(func) }
 
-  override ASTNode getChildInternal(int childIndex) {
-    result.getAST() = func.getParameter(childIndex)
+  override AstNode getChildInternal(int childIndex) {
+    result.getAst() = func.getParameter(childIndex)
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
@@ -515,7 +530,7 @@ class ParametersNode extends PrintASTNode, TParametersNode {
 /**
  * A node representing the initializer list of a `Constructor`.
  */
-class ConstructorInitializersNode extends PrintASTNode, TConstructorInitializersNode {
+class ConstructorInitializersNode extends PrintAstNode, TConstructorInitializersNode {
   Constructor ctor;
 
   ConstructorInitializersNode() { this = TConstructorInitializersNode(ctor) }
@@ -524,8 +539,8 @@ class ConstructorInitializersNode extends PrintASTNode, TConstructorInitializers
 
   final override Location getLocation() { result = getRepresentativeLocation(ctor) }
 
-  final override ASTNode getChildInternal(int childIndex) {
-    result.getAST() = ctor.getInitializer(childIndex)
+  final override AstNode getChildInternal(int childIndex) {
+    result.getAst() = ctor.getInitializer(childIndex)
   }
 
   final override string getChildAccessorPredicateInternal(int childIndex) {
@@ -542,7 +557,7 @@ class ConstructorInitializersNode extends PrintASTNode, TConstructorInitializers
 /**
  * A node representing the destruction list of a `Destructor`.
  */
-class DestructorDestructionsNode extends PrintASTNode, TDestructorDestructionsNode {
+class DestructorDestructionsNode extends PrintAstNode, TDestructorDestructionsNode {
   Destructor dtor;
 
   DestructorDestructionsNode() { this = TDestructorDestructionsNode(dtor) }
@@ -551,8 +566,8 @@ class DestructorDestructionsNode extends PrintASTNode, TDestructorDestructionsNo
 
   final override Location getLocation() { result = getRepresentativeLocation(dtor) }
 
-  final override ASTNode getChildInternal(int childIndex) {
-    result.getAST() = dtor.getDestruction(childIndex)
+  final override AstNode getChildInternal(int childIndex) {
+    result.getAst() = dtor.getDestruction(childIndex)
   }
 
   final override string getChildAccessorPredicateInternal(int childIndex) {
@@ -569,14 +584,14 @@ class DestructorDestructionsNode extends PrintASTNode, TDestructorDestructionsNo
 /**
  * A node representing a `Function`.
  */
-class FunctionNode extends ASTNode {
+class FunctionNode extends AstNode {
   Function func;
 
   FunctionNode() { func = ast }
 
   override string toString() { result = qlClass(func) + getIdentityString(func) }
 
-  override PrintASTNode getChildInternal(int childIndex) {
+  override PrintAstNode getChildInternal(int childIndex) {
     childIndex = 0 and
     result.(ParametersNode).getFunction() = func
     or
@@ -584,7 +599,7 @@ class FunctionNode extends ASTNode {
     result.(ConstructorInitializersNode).getConstructor() = func
     or
     childIndex = 2 and
-    result.(ASTNode).getAST() = func.getEntryPoint()
+    result.(AstNode).getAst() = func.getEntryPoint()
     or
     childIndex = 3 and
     result.(DestructorDestructionsNode).getDestructor() = func
@@ -603,7 +618,7 @@ class FunctionNode extends ASTNode {
   private int getOrder() {
     this =
       rank[result](FunctionNode node, Function function, string file, int line, int column |
-        node.getAST() = function and
+        node.getAst() = function and
         locationSortKeys(function, file, line, column)
       |
         node order by file, line, column, getIdentityString(function)
@@ -856,7 +871,7 @@ private predicate namedExprChildPredicates(Expr expr, Element ele, string pred)
 }
 
 /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
-query predicate nodes(PrintASTNode node, string key, string value) {
+query predicate nodes(PrintAstNode node, string key, string value) {
   node.shouldPrint() and
   value = node.getProperty(key)
 }
@@ -865,7 +880,7 @@ query predicate nodes(PrintASTNode node, string key, string value) {
  * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
  * given `value`.
  */
-query predicate edges(PrintASTNode source, PrintASTNode target, string key, string value) {
+query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
   exists(int childIndex |
     source.shouldPrint() and
     target.shouldPrint() and
diff --git a/cpp/ql/lib/semmle/code/cpp/Specifier.qll b/cpp/ql/lib/semmle/code/cpp/Specifier.qll
index 69cccf06ffb..7a13b13e8c2 100644
--- a/cpp/ql/lib/semmle/code/cpp/Specifier.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Specifier.qll
@@ -38,7 +38,7 @@ class FunctionSpecifier extends Specifier {
 
 /**
  * A C/C++ storage class specifier: `auto`, `register`, `static`, `extern`,
- * or `mutable".
+ * or `mutable`.
  */
 class StorageClassSpecifier extends Specifier {
   StorageClassSpecifier() { this.hasName(["auto", "register", "static", "extern", "mutable"]) }
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index f8552144ea8..e5fbd02d420 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -1085,50 +1085,6 @@ class DerivedType extends Type, @derivedtype {
   override predicate involvesTemplateParameter() { this.getBaseType().involvesTemplateParameter() }
 
   override Type stripType() { result = this.getBaseType().stripType() }
-
-  /**
-   * Holds if this type has the `__autoreleasing` specifier or if it points to
-   * a type with the `__autoreleasing` specifier.
-   *
-   * DEPRECATED: use `hasSpecifier` directly instead.
-   */
-  deprecated predicate isAutoReleasing() {
-    this.hasSpecifier("__autoreleasing") or
-    this.(PointerType).getBaseType().hasSpecifier("__autoreleasing")
-  }
-
-  /**
-   * Holds if this type has the `__strong` specifier or if it points to
-   * a type with the `__strong` specifier.
-   *
-   * DEPRECATED: use `hasSpecifier` directly instead.
-   */
-  deprecated predicate isStrong() {
-    this.hasSpecifier("__strong") or
-    this.(PointerType).getBaseType().hasSpecifier("__strong")
-  }
-
-  /**
-   * Holds if this type has the `__unsafe_unretained` specifier or if it points
-   * to a type with the `__unsafe_unretained` specifier.
-   *
-   * DEPRECATED: use `hasSpecifier` directly instead.
-   */
-  deprecated predicate isUnsafeRetained() {
-    this.hasSpecifier("__unsafe_unretained") or
-    this.(PointerType).getBaseType().hasSpecifier("__unsafe_unretained")
-  }
-
-  /**
-   * Holds if this type has the `__weak` specifier or if it points to
-   * a type with the `__weak` specifier.
-   *
-   * DEPRECATED: use `hasSpecifier` directly instead.
-   */
-  deprecated predicate isWeak() {
-    this.hasSpecifier("__weak") or
-    this.(PointerType).getBaseType().hasSpecifier("__weak")
-  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
index 51bcf6f6127..4721ecc2612 100644
--- a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
+++ b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
@@ -106,25 +106,4 @@ class NestedTypedefType extends TypedefType {
   NestedTypedefType() { this.isMember() }
 
   override string getAPrimaryQlClass() { result = "NestedTypedefType" }
-
-  /**
-   * DEPRECATED: use `.hasSpecifier("private")` instead.
-   *
-   * Holds if this member is private.
-   */
-  deprecated predicate isPrivate() { this.hasSpecifier("private") }
-
-  /**
-   * DEPRECATED: `.hasSpecifier("protected")` instead.
-   *
-   * Holds if this member is protected.
-   */
-  deprecated predicate isProtected() { this.hasSpecifier("protected") }
-
-  /**
-   * DEPRECATED: use `.hasSpecifier("public")` instead.
-   *
-   * Holds if this member is public.
-   */
-  deprecated predicate isPublic() { this.hasSpecifier("public") }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/Variable.qll b/cpp/ql/lib/semmle/code/cpp/Variable.qll
index 2c7d85f9cc8..2e3d6bf3ca2 100644
--- a/cpp/ql/lib/semmle/code/cpp/Variable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Variable.qll
@@ -556,24 +556,6 @@ class MemberVariable extends Variable, @membervariable {
   private Type getAType() { membervariables(underlyingElement(this), unresolveElement(result), _) }
 }
 
-/**
- * A C/C++ function pointer variable.
- *
- * DEPRECATED: use `Variable.getType() instanceof FunctionPointerType` instead.
- */
-deprecated class FunctionPointerVariable extends Variable {
-  FunctionPointerVariable() { this.getType() instanceof FunctionPointerType }
-}
-
-/**
- * A C/C++ function pointer member variable.
- *
- * DEPRECATED: use `MemberVariable.getType() instanceof FunctionPointerType` instead.
- */
-deprecated class FunctionPointerMemberVariable extends MemberVariable {
-  FunctionPointerMemberVariable() { this instanceof FunctionPointerVariable }
-}
-
 /**
  * A C++14 variable template. For example, in the following code the variable
  * template `v` defines a family of variables:
diff --git a/cpp/ql/lib/semmle/code/cpp/XML.qll b/cpp/ql/lib/semmle/code/cpp/XML.qll
index dc76884b73c..fb781a4683f 100755
--- a/cpp/ql/lib/semmle/code/cpp/XML.qll
+++ b/cpp/ql/lib/semmle/code/cpp/XML.qll
@@ -4,21 +4,14 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
-  /**
-   * DEPRECATED: Use `getLocation()` instead.
-   *
-   * Gets the source location for this element.
-   */
-  deprecated Location getALocation() { result = this.getLocation() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -83,21 +76,6 @@ class XMLParent extends @xmlparent {
   /** Gets the number of places in the body of this XML parent where text occurs. */
   int getNumberOfCharacterSets() { result = count(int pos | xmlChars(_, _, this, pos, _, _)) }
 
-  /**
-   * DEPRECATED: Internal.
-   *
-   * Append the character sequences of this XML parent from left to right, separated by a space,
-   * up to a specified (zero-based) index.
-   */
-  deprecated string charsSetUpTo(int n) {
-    n = 0 and xmlChars(_, result, this, 0, _, _)
-    or
-    n > 0 and
-    exists(string chars | xmlChars(_, chars, this, n, _, _) |
-      result = this.charsSetUpTo(n - 1) + " " + chars
-    )
-  }
-
   /**
    * Gets the result of appending all the character sequences of this XML parent from
    * left to right, separated by a space.
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Alloc.qll b/cpp/ql/lib/semmle/code/cpp/commons/Alloc.qll
index a9597fc72b5..ce3f6993525 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Alloc.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Alloc.qll
@@ -2,20 +2,6 @@ import cpp
 import semmle.code.cpp.models.interfaces.Allocation
 import semmle.code.cpp.models.interfaces.Deallocation
 
-/**
- * A library routine that allocates memory.
- *
- * DEPRECATED: Use the `AllocationFunction` class instead of this predicate.
- */
-deprecated predicate allocationFunction(Function f) { f instanceof AllocationFunction }
-
-/**
- * A call to a library routine that allocates memory.
- *
- * DEPRECATED: Use `AllocationExpr` instead (this also includes `new` expressions).
- */
-deprecated predicate allocationCall(FunctionCall fc) { fc instanceof AllocationExpr }
-
 /**
  * A library routine that frees memory.
  */
@@ -33,13 +19,6 @@ predicate freeCall(FunctionCall fc, Expr arg) { arg = fc.(DeallocationExpr).getF
  */
 predicate isMemoryManagementExpr(Expr e) { isAllocationExpr(e) or e instanceof DeallocationExpr }
 
-/**
- * Is e an allocation from stdlib.h (`malloc`, `realloc` etc)?
- *
- * DEPRECATED: Use `AllocationExpr` instead (this also includes `new` expressions).
- */
-deprecated predicate isStdLibAllocationExpr(Expr e) { allocationCall(e) }
-
 /**
  * Is e some kind of allocation (`new`, `alloc`, `realloc` etc)?
  */
@@ -48,19 +27,3 @@ predicate isAllocationExpr(Expr e) {
   or
   e = any(NewOrNewArrayExpr new | not exists(new.getPlacementPointer()))
 }
-
-/**
- * Is e some kind of allocation (`new`, `alloc`, `realloc` etc) with a fixed size?
- *
- * DEPRECATED: Use `AllocationExpr.getSizeBytes()` instead.
- */
-deprecated predicate isFixedSizeAllocationExpr(Expr allocExpr, int size) {
-  size = allocExpr.(AllocationExpr).getSizeBytes()
-}
-
-/**
- * Is e some kind of deallocation (`delete`, `free`, `realloc` etc)?
- *
- * DEPRECATED: Use `DeallocationExpr` instead.
- */
-deprecated predicate isDeallocationExpr(Expr e) { e instanceof DeallocationExpr }
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
index 4a6566da45d..dc7b8352d4b 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
@@ -207,26 +207,6 @@ predicate variadicFormatter(Function f, string type, int formatParamIndex, int o
   callsVariadicFormatter(f, type, formatParamIndex, outputParamIndex)
 }
 
-/**
- * A standard function such as `vprintf` that has a format parameter
- * and a variable argument list of type `va_arg`.
- *
- * DEPRECATED: Use the four argument version instead.
- */
-deprecated predicate primitiveVariadicFormatter(TopLevelFunction f, int formatParamIndex) {
-  primitiveVariadicFormatter(f, _, formatParamIndex, _)
-}
-
-/**
- * Holds if `f` is a function such as `vprintf` that has a format parameter
- * (at `formatParamIndex`) and a variable argument list of type `va_arg`.
- *
- * DEPRECATED: Use the four argument version instead.
- */
-deprecated predicate variadicFormatter(Function f, int formatParamIndex) {
-  variadicFormatter(f, _, formatParamIndex, _)
-}
-
 /**
  * A function not in the standard library which takes a `printf`-like formatting
  * string and a variable number of arguments.
@@ -428,13 +408,6 @@ class FormatLiteral extends Literal {
    */
   FormattingFunctionCall getUse() { result.getFormat() = this }
 
-  /**
-   * Holds if the default meaning of `%s` is a `wchar_t *`, rather than
-   * a `char *` (either way, `%S` will have the opposite meaning).
-   * DEPRECATED: Use getDefaultCharType() instead.
-   */
-  deprecated predicate isWideCharDefault() { this.getUse().getTarget().isWideCharDefault() }
-
   /**
    * Gets the default character type expected for `%s` by this format literal.  Typically
    * `char` or `wchar_t`.
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/BasicBlocks.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/BasicBlocks.qll
index 34373d943af..11a7e8f9e64 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/BasicBlocks.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/BasicBlocks.qll
@@ -223,20 +223,6 @@ class BasicBlock extends ControlFlowNodeBase {
    */
   predicate inLoop() { this.getASuccessor+() = this }
 
-  /**
-   * DEPRECATED since version 1.11: this predicate does not match the standard
-   * definition of _loop header_.
-   *
-   * Holds if this basic block is in a loop of the control-flow graph and
-   * additionally has an incoming edge that is not part of any loop containing
-   * this basic block. A typical example would be the basic block that computes
-   * `x > 0` in an outermost loop `while (x > 0) { ... }`.
-   */
-  deprecated predicate isLoopHeader() {
-    this.inLoop() and
-    exists(BasicBlock pred | pred = this.getAPredecessor() and not pred = this.getASuccessor+())
-  }
-
   /**
    * Holds if control flow may reach this basic block from a function entry
    * point or any handler of a reachable `try` statement.
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll
index c7b3d1dc16f..846d8047982 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll
@@ -65,7 +65,7 @@ class ControlFlowNode extends Locatable, ControlFlowNodeBase {
    * taken when this expression is true.
    */
   ControlFlowNode getATrueSuccessor() {
-    qlCFGTrueSuccessor(this, result) and
+    qlCfgTrueSuccessor(this, result) and
     result = this.getASuccessor()
   }
 
@@ -74,7 +74,7 @@ class ControlFlowNode extends Locatable, ControlFlowNodeBase {
    * taken when this expression is false.
    */
   ControlFlowNode getAFalseSuccessor() {
-    qlCFGFalseSuccessor(this, result) and
+    qlCfgFalseSuccessor(this, result) and
     result = this.getASuccessor()
   }
 
@@ -94,24 +94,6 @@ import ControlFlowGraphPublic
  */
 class ControlFlowNodeBase extends ElementBase, @cfgnode { }
 
-/**
- * DEPRECATED: Use `ControlFlowNode.getATrueSuccessor()` instead.
- * Holds when `n2` is a control-flow node such that the control-flow
- * edge `(n1, n2)` may be taken when `n1` is an expression that is true.
- */
-deprecated predicate truecond_base(ControlFlowNodeBase n1, ControlFlowNodeBase n2) {
-  qlCFGTrueSuccessor(n1, n2)
-}
-
-/**
- * DEPRECATED: Use `ControlFlowNode.getAFalseSuccessor()` instead.
- * Holds when `n2` is a control-flow node such that the control-flow
- * edge `(n1, n2)` may be taken when `n1` is an expression that is false.
- */
-deprecated predicate falsecond_base(ControlFlowNodeBase n1, ControlFlowNodeBase n2) {
-  qlCFGFalseSuccessor(n1, n2)
-}
-
 /**
  * An abstract class that can be extended to add additional edges to the
  * control-flow graph. Instances of this class correspond to the source nodes
@@ -139,7 +121,7 @@ abstract class AdditionalControlFlowEdge extends ControlFlowNodeBase {
  * `AdditionalControlFlowEdge`. Use this relation instead of `qlCFGSuccessor`.
  */
 predicate successors_extended(ControlFlowNodeBase source, ControlFlowNodeBase target) {
-  qlCFGSuccessor(source, target)
+  qlCfgSuccessor(source, target)
   or
   source.(AdditionalControlFlowEdge).getAnEdgeTarget() = target
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
index 2b222376a0b..d12eaa4e238 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -33,8 +33,8 @@ class GuardCondition extends Expr {
     or
     // the IR short-circuits if(!x)
     // don't produce a guard condition for `y = !x` and other non-short-circuited cases
-    not exists(Instruction inst | this.getFullyConverted() = inst.getAST()) and
-    exists(IRGuardCondition ir | this.(NotExpr).getOperand() = ir.getAST())
+    not exists(Instruction inst | this.getFullyConverted() = inst.getAst()) and
+    exists(IRGuardCondition ir | this.(NotExpr).getOperand() = ir.getAst())
   }
 
   /**
@@ -146,8 +146,8 @@ private class GuardConditionFromBinaryLogicalOperator extends GuardCondition {
  */
 private class GuardConditionFromShortCircuitNot extends GuardCondition, NotExpr {
   GuardConditionFromShortCircuitNot() {
-    not exists(Instruction inst | this.getFullyConverted() = inst.getAST()) and
-    exists(IRGuardCondition ir | this.getOperand() = ir.getAST())
+    not exists(Instruction inst | this.getFullyConverted() = inst.getAst()) and
+    exists(IRGuardCondition ir | this.getOperand() = ir.getAst())
   }
 
   override predicate controls(BasicBlock controlled, boolean testIsTrue) {
@@ -241,7 +241,7 @@ private class GuardConditionFromIR extends GuardCondition {
   private predicate controlsBlock(BasicBlock controlled, boolean testIsTrue) {
     exists(IRBlock irb |
       forex(IRGuardCondition inst | inst = ir | inst.controls(irb, testIsTrue)) and
-      irb.getAnInstruction().getAST().(ControlFlowNode).getBasicBlock() = controlled and
+      irb.getAnInstruction().getAst().(ControlFlowNode).getBasicBlock() = controlled and
       not isUnreachedBlock(irb)
     )
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/LocalScopeVariableReachability.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/LocalScopeVariableReachability.qll
deleted file mode 100644
index f6685865830..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/LocalScopeVariableReachability.qll
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * DEPRECATED: Use `StackVariableReachability` instead.
- */
-
-import cpp
-
-/**
- * DEPRECATED: Use `StackVariableReachability` instead.
- *
- * A reachability analysis for control-flow nodes involving stack variables.
- * This defines sources, sinks, and any other configurable aspect of the
- * analysis. Multiple analyses can coexist. To create an analysis, extend this
- * class with a subclass whose characteristic predicate is a unique singleton
- * string. For example, write
- *
- * ```
- * class MyAnalysisConfiguration extends LocalScopeVariableReachability {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Override `isBarrier`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some source and sink, call the
- * `reaches` predicate on an instance of `MyAnalysisConfiguration`.
- */
-abstract deprecated class LocalScopeVariableReachability extends string {
-  bindingset[this]
-  LocalScopeVariableReachability() { length() >= 0 }
-
-  /** Holds if `node` is a source for the reachability analysis using variable `v`. */
-  abstract predicate isSource(ControlFlowNode node, LocalScopeVariable v);
-
-  /** Holds if `sink` is a (potential) sink for the reachability analysis using variable `v`. */
-  abstract predicate isSink(ControlFlowNode node, LocalScopeVariable v);
-
-  /** Holds if `node` is a barrier for the reachability analysis using variable `v`. */
-  abstract predicate isBarrier(ControlFlowNode node, LocalScopeVariable v);
-
-  /**
-   * Holds if the source node `source` can reach the sink `sink` without crossing
-   * a barrier. This is (almost) equivalent to the following QL predicate but
-   * uses basic blocks internally for better performance:
-   *
-   * ```
-   * predicate reaches(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-   *   reachesImpl(source, v, sink)
-   *   and
-   *   isSink(sink, v)
-   * }
-   *
-   * predicate reachesImpl(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-   *   sink = source.getASuccessor() and isSource(source, v)
-   *   or
-   *   exists(ControlFlowNode mid | reachesImpl(source, v, mid) |
-   *     not isBarrier(mid, v)
-   *     and
-   *     sink = mid.getASuccessor()
-   *   )
-   * }
-   * ```
-   *
-   * In addition to using a better performing implementation, this analysis
-   * accounts for loops where the condition is provably true upon entry.
-   */
-  predicate reaches(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-    /*
-     * Implementation detail: the predicates in this class are a generalization of
-     * those in DefinitionsAndUses.qll, and should be kept in sync.
-     *
-     * Unfortunately, caching of abstract predicates does not work well, so the
-     * predicates in DefinitionsAndUses.qll cannot use this library.
-     */
-
-    exists(BasicBlock bb, int i |
-      this.isSource(source, v) and
-      bb.getNode(i) = source and
-      not bb.isUnreachable()
-    |
-      exists(int j |
-        j > i and
-        sink = bb.getNode(j) and
-        this.isSink(sink, v) and
-        not exists(int k | this.isBarrier(bb.getNode(k), v) | k in [i + 1 .. j - 1])
-      )
-      or
-      not exists(int k | this.isBarrier(bb.getNode(k), v) | k > i) and
-      this.bbSuccessorEntryReaches(bb, v, sink, _)
-    )
-  }
-
-  private predicate bbSuccessorEntryReaches(
-    BasicBlock bb, SemanticStackVariable v, ControlFlowNode node,
-    boolean skipsFirstLoopAlwaysTrueUponEntry
-  ) {
-    exists(BasicBlock succ, boolean succSkipsFirstLoopAlwaysTrueUponEntry |
-      bbSuccessorEntryReachesLoopInvariant(bb, succ, skipsFirstLoopAlwaysTrueUponEntry,
-        succSkipsFirstLoopAlwaysTrueUponEntry)
-    |
-      this.bbEntryReachesLocally(succ, v, node) and
-      succSkipsFirstLoopAlwaysTrueUponEntry = false
-      or
-      not this.isBarrier(succ.getNode(_), v) and
-      this.bbSuccessorEntryReaches(succ, v, node, succSkipsFirstLoopAlwaysTrueUponEntry)
-    )
-  }
-
-  private predicate bbEntryReachesLocally(
-    BasicBlock bb, SemanticStackVariable v, ControlFlowNode node
-  ) {
-    exists(int n |
-      node = bb.getNode(n) and
-      this.isSink(node, v)
-    |
-      not exists(this.firstBarrierIndexIn(bb, v))
-      or
-      n <= this.firstBarrierIndexIn(bb, v)
-    )
-  }
-
-  private int firstBarrierIndexIn(BasicBlock bb, SemanticStackVariable v) {
-    result = min(int m | this.isBarrier(bb.getNode(m), v))
-  }
-}
-
-/**
- * Holds if `bb` contains the entry point `loop` for a loop at position `i`.
- * The condition of that loop is provably true upon entry but not provably
- * true in general (if it were, the false-successor had already been removed
- * from the CFG).
- *
- * Examples:
- * ```
- * for (int i = 0; i < 2; i++) { } // always true upon entry
- * for (int i = 0; true; i++) { } // always true
- * ```
- */
-private predicate bbLoopEntryConditionAlwaysTrueAt(BasicBlock bb, int i, ControlFlowNode loop) {
-  exists(Expr condition |
-    loopConditionAlwaysTrueUponEntry(loop, condition) and
-    not conditionAlwaysTrue(condition) and
-    bb.getNode(i) = loop
-  )
-}
-
-/**
- * Basic block `pred` contains all or part of the condition belonging to a loop,
- * and there is an edge from `pred` to `succ` that concludes the condition.
- * If the edge corrseponds with the loop condition being found to be `true`, then
- * `skipsLoop` is `false`.  Otherwise the edge corresponds with the loop condition
- * being found to be `false` and `skipsLoop` is `true`.  Non-concluding edges
- * within a complex loop condition are not matched by this predicate.
- */
-private predicate bbLoopConditionAlwaysTrueUponEntrySuccessor(
-  BasicBlock pred, BasicBlock succ, boolean skipsLoop
-) {
-  exists(Expr cond |
-    loopConditionAlwaysTrueUponEntry(_, cond) and
-    cond.getAChild*() = pred.getEnd() and
-    succ = pred.getASuccessor() and
-    not cond.getAChild*() = succ.getStart() and
-    (
-      succ = pred.getAFalseSuccessor() and
-      skipsLoop = true
-      or
-      succ = pred.getATrueSuccessor() and
-      skipsLoop = false
-    )
-  )
-}
-
-/**
- * Loop invariant for `bbSuccessorEntryReaches`:
- *
- * - `succ` is a successor of `pred`.
- * - `predSkipsFirstLoopAlwaysTrueUponEntry`: whether the path from
- * `pred` (via `succ`) skips the first loop where the condition is
- * provably true upon entry.
- * - `succSkipsFirstLoopAlwaysTrueUponEntry`: whether the path from
- * `succ` skips the first loop where the condition is provably true
- * upon entry.
- * - If `pred` contains the entry point of a loop where the condition
- * is provably true upon entry, then `succ` is not allowed to skip
- * that loop (`succSkipsFirstLoopAlwaysTrueUponEntry = false`).
- */
-predicate bbSuccessorEntryReachesLoopInvariant(
-  BasicBlock pred, BasicBlock succ, boolean predSkipsFirstLoopAlwaysTrueUponEntry,
-  boolean succSkipsFirstLoopAlwaysTrueUponEntry
-) {
-  succ = pred.getASuccessor() and
-  (succSkipsFirstLoopAlwaysTrueUponEntry = true or succSkipsFirstLoopAlwaysTrueUponEntry = false) and
-  (
-    // The edge from `pred` to `succ` is from a loop condition provably
-    // true upon entry, so the value of `predSkipsFirstLoopAlwaysTrueUponEntry`
-    // is determined by whether the true edge or the false edge is chosen,
-    // regardless of the value of `succSkipsFirstLoopAlwaysTrueUponEntry`.
-    bbLoopConditionAlwaysTrueUponEntrySuccessor(pred, succ, predSkipsFirstLoopAlwaysTrueUponEntry)
-    or
-    // The edge from `pred` to `succ` is _not_ from a loop condition provably
-    // true upon entry, so the values of `predSkipsFirstLoopAlwaysTrueUponEntry`
-    // and `succSkipsFirstLoopAlwaysTrueUponEntry` must be the same.
-    not bbLoopConditionAlwaysTrueUponEntrySuccessor(pred, succ, _) and
-    succSkipsFirstLoopAlwaysTrueUponEntry = predSkipsFirstLoopAlwaysTrueUponEntry and
-    // Moreover, if `pred` contains the entry point of a loop where the
-    // condition is provably true upon entry, then `succ` is not allowed
-    // to skip that loop, and hence `succSkipsFirstLoopAlwaysTrueUponEntry = false`.
-    (
-      bbLoopEntryConditionAlwaysTrueAt(pred, _, _)
-      implies
-      succSkipsFirstLoopAlwaysTrueUponEntry = false
-    )
-  )
-}
-
-/**
- * DEPRECATED: Use `StackVariableReachabilityWithReassignment` instead.
- *
- * Reachability analysis for control-flow nodes involving stack variables.
- * Unlike `LocalScopeVariableReachability`, this analysis takes variable
- * reassignments into account.
- *
- * This class is used like `LocalScopeVariableReachability`, except that
- * subclasses should override `isSourceActual` and `isSinkActual` instead of
- * `isSource` and `isSink`, and that there is a `reachesTo` predicate in
- * addition to `reaches`.
- */
-abstract deprecated class LocalScopeVariableReachabilityWithReassignment extends LocalScopeVariableReachability {
-  bindingset[this]
-  LocalScopeVariableReachabilityWithReassignment() { length() >= 0 }
-
-  /** Override this predicate rather than `isSource` (`isSource` is used internally). */
-  abstract predicate isSourceActual(ControlFlowNode node, LocalScopeVariable v);
-
-  /** Override this predicate rather than `isSink` (`isSink` is used internally). */
-  abstract predicate isSinkActual(ControlFlowNode node, LocalScopeVariable v);
-
-  /**
-   * Holds if the source node `source` can reach the sink `sink` without crossing
-   * a barrier, taking reassignments into account. This is (almost) equivalent
-   * to the following QL predicate, but uses basic blocks internally for better
-   * performance:
-   *
-   * ```
-   * predicate reaches(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-   *   reachesImpl(source, v, sink)
-   *   and
-   *   isSinkActual(sink, v)
-   * }
-   *
-   * predicate reachesImpl(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-   *   isSourceActual(source, v)
-   *   and
-   *   (
-   *     sink = source.getASuccessor()
-   *     or
-   *     exists(ControlFlowNode mid, SemanticStackVariable v0 | reachesImpl(source, v0, mid) |
-   *       // ordinary successor
-   *       not isBarrier(mid, v) and
-   *       sink = mid.getASuccessor() and
-   *       v = v0
-   *       or
-   *       // reassigned from v0 to v
-   *       exprDefinition(v, mid, v0.getAnAccess()) and
-   *       sink = mid.getASuccessor()
-   *     )
-   *   )
-   * }
-   * ```
-   *
-   * In addition to using a better performing implementation, this analysis
-   * accounts for loops where the condition is provably true upon entry.
-   */
-  override predicate reaches(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-    this.reachesTo(source, v, sink, _)
-  }
-
-  /**
-   * As `reaches`, but also specifies the last variable it was reassigned to (`v0`).
-   */
-  predicate reachesTo(
-    ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink, SemanticStackVariable v0
-  ) {
-    exists(ControlFlowNode def |
-      this.actualSourceReaches(source, v, def, v0) and
-      LocalScopeVariableReachability.super.reaches(def, v0, sink) and
-      this.isSinkActual(sink, v0)
-    )
-  }
-
-  private predicate actualSourceReaches(
-    ControlFlowNode source, SemanticStackVariable v, ControlFlowNode def, SemanticStackVariable v0
-  ) {
-    this.isSourceActual(source, v) and def = source and v0 = v
-    or
-    exists(ControlFlowNode source1, SemanticStackVariable v1 |
-      this.actualSourceReaches(source, v, source1, v1)
-    |
-      this.reassignment(source1, v1, def, v0)
-    )
-  }
-
-  private predicate reassignment(
-    ControlFlowNode source, SemanticStackVariable v, ControlFlowNode def, SemanticStackVariable v0
-  ) {
-    LocalScopeVariableReachability.super.reaches(source, v, def) and
-    exprDefinition(v0, def, v.getAnAccess())
-  }
-
-  final override predicate isSource(ControlFlowNode node, LocalScopeVariable v) {
-    this.isSourceActual(node, v)
-    or
-    // Reassignment generates a new (non-actual) source
-    this.reassignment(_, _, node, v)
-  }
-
-  final override predicate isSink(ControlFlowNode node, LocalScopeVariable v) {
-    this.isSinkActual(node, v)
-    or
-    // Reassignment generates a new (non-actual) sink
-    exprDefinition(_, node, v.getAnAccess())
-  }
-}
-
-/**
- * DEPRECATED: Use `StackVariableReachabilityExt` instead.
- *
- * Same as `LocalScopeVariableReachability`, but `isBarrier` works on control-flow
- * edges rather than nodes and is therefore parameterized by the original
- * source node as well. Otherwise, this class is used like
- * `LocalScopeVariableReachability`.
- */
-abstract deprecated class LocalScopeVariableReachabilityExt extends string {
-  bindingset[this]
-  LocalScopeVariableReachabilityExt() { length() >= 0 }
-
-  /** `node` is a source for the reachability analysis using variable `v`. */
-  abstract predicate isSource(ControlFlowNode node, LocalScopeVariable v);
-
-  /** `sink` is a (potential) sink for the reachability analysis using variable `v`. */
-  abstract predicate isSink(ControlFlowNode node, LocalScopeVariable v);
-
-  /** `node` is a barrier for the reachability analysis using variable `v` and starting from `source`. */
-  abstract predicate isBarrier(
-    ControlFlowNode source, ControlFlowNode node, ControlFlowNode next, LocalScopeVariable v
-  );
-
-  /** See `LocalScopeVariableReachability.reaches`. */
-  predicate reaches(ControlFlowNode source, SemanticStackVariable v, ControlFlowNode sink) {
-    exists(BasicBlock bb, int i |
-      this.isSource(source, v) and
-      bb.getNode(i) = source and
-      not bb.isUnreachable()
-    |
-      exists(int j |
-        j > i and
-        sink = bb.getNode(j) and
-        this.isSink(sink, v) and
-        not exists(int k | this.isBarrier(source, bb.getNode(k), bb.getNode(k + 1), v) |
-          k in [i .. j - 1]
-        )
-      )
-      or
-      not exists(int k | this.isBarrier(source, bb.getNode(k), bb.getNode(k + 1), v) | k >= i) and
-      this.bbSuccessorEntryReaches(source, bb, v, sink, _)
-    )
-  }
-
-  private predicate bbSuccessorEntryReaches(
-    ControlFlowNode source, BasicBlock bb, SemanticStackVariable v, ControlFlowNode node,
-    boolean skipsFirstLoopAlwaysTrueUponEntry
-  ) {
-    exists(BasicBlock succ, boolean succSkipsFirstLoopAlwaysTrueUponEntry |
-      bbSuccessorEntryReachesLoopInvariant(bb, succ, skipsFirstLoopAlwaysTrueUponEntry,
-        succSkipsFirstLoopAlwaysTrueUponEntry) and
-      not this.isBarrier(source, bb.getEnd(), succ.getStart(), v)
-    |
-      this.bbEntryReachesLocally(source, succ, v, node) and
-      succSkipsFirstLoopAlwaysTrueUponEntry = false
-      or
-      not exists(int k | this.isBarrier(source, succ.getNode(k), succ.getNode(k + 1), v)) and
-      this.bbSuccessorEntryReaches(source, succ, v, node, succSkipsFirstLoopAlwaysTrueUponEntry)
-    )
-  }
-
-  private predicate bbEntryReachesLocally(
-    ControlFlowNode source, BasicBlock bb, SemanticStackVariable v, ControlFlowNode node
-  ) {
-    this.isSource(source, v) and
-    exists(int n | node = bb.getNode(n) and this.isSink(node, v) |
-      not exists(int m | m < n | this.isBarrier(source, bb.getNode(m), bb.getNode(m + 1), v))
-    )
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/Nullness.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/Nullness.qll
index 69d2166a1d2..40c975873b4 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/Nullness.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/Nullness.qll
@@ -156,15 +156,6 @@ class AnalysedExpr extends Expr {
     this.isValidCheck(v) and result = this.getATrueSuccessor()
   }
 
-  /**
-   * DEPRECATED: Use `getNonNullSuccessor` instead, which does the same.
-   */
-  deprecated ControlFlowNode getValidSuccessor(LocalScopeVariable v) {
-    this.isValidCheck(v) and result = this.getATrueSuccessor()
-    or
-    this.isNullCheck(v) and result = this.getAFalseSuccessor()
-  }
-
   /**
    * Holds if this is a `VariableAccess` of `v` nested inside a condition.
    */
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
index c7af3fe4326..4732cd06184 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
@@ -10,10 +10,13 @@ import SSAUtils
  * The SSA logic comes in two versions: the standard SSA and range-analysis RangeSSA.
  * This class provides the standard SSA logic.
  */
-library class StandardSSA extends SSAHelper {
-  StandardSSA() { this = 0 }
+library class StandardSsa extends SsaHelper {
+  StandardSsa() { this = 0 }
 }
 
+/** DEPRECATED: Alias for StandardSsa */
+deprecated class StandardSSA = StandardSsa;
+
 /**
  * A definition of one or more SSA variables, including phi node definitions.
  * An _SSA variable_, as defined in the literature, is effectively the pair of
@@ -27,22 +30,22 @@ library class StandardSSA extends SSAHelper {
  * statically seen to be unreachable.
  */
 class SsaDefinition extends ControlFlowNodeBase {
-  SsaDefinition() { exists(StandardSSA x | x.ssa_defn(_, this, _, _)) }
+  SsaDefinition() { exists(StandardSsa x | x.ssa_defn(_, this, _, _)) }
 
   /**
    * Gets a variable corresponding to an SSA StackVariable defined by
    * this definition.
    */
-  StackVariable getAVariable() { exists(StandardSSA x | x.ssa_defn(result, this, _, _)) }
+  StackVariable getAVariable() { exists(StandardSsa x | x.ssa_defn(result, this, _, _)) }
 
   /**
    * Gets a string representation of the SSA variable represented by the pair
    * `(this, v)`.
    */
-  string toString(StackVariable v) { exists(StandardSSA x | result = x.toString(this, v)) }
+  string toString(StackVariable v) { exists(StandardSsa x | result = x.toString(this, v)) }
 
   /** Gets a use of the SSA variable represented by the pair `(this, v)`. */
-  VariableAccess getAUse(StackVariable v) { exists(StandardSSA x | result = x.getAUse(this, v)) }
+  VariableAccess getAUse(StackVariable v) { exists(StandardSsa x | result = x.getAUse(this, v)) }
 
   /**
    * Gets the control-flow node for this definition. This will usually be the
@@ -62,7 +65,7 @@ class SsaDefinition extends ControlFlowNodeBase {
   BasicBlock getBasicBlock() { result.contains(this.getDefinition()) }
 
   /** Holds if this definition is a phi node for variable `v`. */
-  predicate isPhiNode(StackVariable v) { exists(StandardSSA x | x.phi_node(v, this)) }
+  predicate isPhiNode(StackVariable v) { exists(StandardSsa x | x.phi_node(v, this)) }
 
   /** Gets the location of this definition. */
   Location getLocation() { result = this.(ControlFlowNode).getLocation() }
@@ -124,7 +127,7 @@ class SsaDefinition extends ControlFlowNodeBase {
 
   /** Holds if `(this, v)` reaches the end of basic block `b`. */
   predicate reachesEndOfBB(StackVariable v, BasicBlock b) {
-    exists(StandardSSA x | x.ssaDefinitionReachesEndOfBB(v, this, b))
+    exists(StandardSsa x | x.ssaDefinitionReachesEndOfBB(v, this, b))
   }
 
   /**
@@ -147,15 +150,4 @@ class SsaDefinition extends ControlFlowNodeBase {
   Expr getAnUltimateDefiningValue(StackVariable v) {
     result = this.getAnUltimateSsaDefinition(v).getDefiningValue(v)
   }
-
-  /**
-   * DEPRECATED: this is the old name for `getAnUltimateDefiningValue`. The
-   * name was confusing as it seemed analogous to `getDefinition` rather than
-   * `getDefiningValue`. The SSA libraries for other languages use the name
-   * `getAnUltimateSsaDefinition` to refer to a predicate named
-   * `getAnUltimateSsaDefinition` in this class.
-   */
-  deprecated Expr getAnUltimateDefinition(StackVariable v) {
-    result = this.getAnUltimateDefiningValue(v)
-  }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
index b7d0742fac6..2252864c249 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
@@ -114,10 +114,10 @@ private predicate live_at_exit_of_bb(StackVariable v, BasicBlock b) {
 
 /** Common SSA logic for standard SSA and range-analysis SSA. */
 cached
-library class SSAHelper extends int {
+library class SsaHelper extends int {
   /* 0 = StandardSSA, 1 = RangeSSA */
   cached
-  SSAHelper() { this in [0 .. 1] }
+  SsaHelper() { this in [0 .. 1] }
 
   /**
    * Override to insert a custom phi node for variable `v` at the start of
@@ -311,3 +311,6 @@ library class SSAHelper extends int {
     ssa_use(v, result, _, _)
   }
 }
+
+/** DEPRECATED: Alias for SsaHelper */
+deprecated class SSAHelper = SsaHelper;
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
index ca1964a43c3..96f03c931bf 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
@@ -447,26 +447,6 @@ private predicate skipInitializer(Initializer init) {
   )
 }
 
-/**
- * Holds if `e` is an expression in a static initializer that must be evaluated
- * at run time. This predicate computes "is non-const" instead of "is const" in
- * order to avoid recursion through forall.
- */
-private predicate runtimeExprInStaticInitializer(Expr e) {
-  inStaticInitializer(e) and
-  if e instanceof AggregateLiteral
-  then runtimeExprInStaticInitializer(e.getAChild())
-  else not e.getFullyConverted().isConstant()
-}
-
-/** Holds if `e` is part of the initializer of a local static variable. */
-private predicate inStaticInitializer(Expr e) {
-  exists(LocalVariable local |
-    local.isStatic() and
-    e.getParent+() = local.getInitializer()
-  )
-}
-
 /**
  * Gets the `i`th child of `n` in control-flow order, where the `i`-indexes are
  * contiguous, and the first index is 0.
@@ -1379,7 +1359,7 @@ private module Cached {
    * true-successors and false-successors.
    */
   cached
-  predicate qlCFGSuccessor(Node n1, Node n2) {
+  predicate qlCfgSuccessor(Node n1, Node n2) {
     exists(Node memberNode, Pos memberPos |
       subEdgeIncludingDestructors(any(Pos at | at.isAt()), n1, memberNode, memberPos) and
       normalGroupMember(memberNode, memberPos, n2)
@@ -1388,23 +1368,32 @@ private module Cached {
     conditionalSuccessor(n1, _, n2)
   }
 
+  /** DEPRECATED: Alias for qlCfgSuccessor */
+  deprecated predicate qlCFGSuccessor = qlCfgSuccessor/2;
+
   /**
    * Holds if `n2` is a control-flow node such that the control-flow
    * edge `(n1, n2)` may be taken when `n1` is an expression that is true.
    */
   cached
-  predicate qlCFGTrueSuccessor(Node n1, Node n2) {
+  predicate qlCfgTrueSuccessor(Node n1, Node n2) {
     conditionalSuccessor(n1, true, n2) and
     not conditionalSuccessor(n1, false, n2)
   }
 
+  /** DEPRECATED: Alias for qlCfgTrueSuccessor */
+  deprecated predicate qlCFGTrueSuccessor = qlCfgTrueSuccessor/2;
+
   /**
    * Holds if `n2` is a control-flow node such that the control-flow
    * edge `(n1, n2)` may be taken when `n1` is an expression that is false.
    */
   cached
-  predicate qlCFGFalseSuccessor(Node n1, Node n2) {
+  predicate qlCfgFalseSuccessor(Node n1, Node n2) {
     conditionalSuccessor(n1, false, n2) and
     not conditionalSuccessor(n1, true, n2)
   }
+
+  /** DEPRECATED: Alias for qlCfgFalseSuccessor */
+  deprecated predicate qlCFGFalseSuccessor = qlCfgFalseSuccessor/2;
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
index a561771fe01..923533ee2fd 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
@@ -188,8 +188,8 @@ private predicate nonAnalyzableFunction(Function f) {
  */
 private predicate impossibleFalseEdge(Expr condition, Node succ) {
   conditionAlwaysTrue(condition) and
-  qlCFGFalseSuccessor(condition, succ) and
-  not qlCFGTrueSuccessor(condition, succ)
+  qlCfgFalseSuccessor(condition, succ) and
+  not qlCfgTrueSuccessor(condition, succ)
 }
 
 /**
@@ -197,8 +197,8 @@ private predicate impossibleFalseEdge(Expr condition, Node succ) {
  */
 private predicate impossibleTrueEdge(Expr condition, Node succ) {
   conditionAlwaysFalse(condition) and
-  qlCFGTrueSuccessor(condition, succ) and
-  not qlCFGFalseSuccessor(condition, succ)
+  qlCfgTrueSuccessor(condition, succ) and
+  not qlCfgFalseSuccessor(condition, succ)
 }
 
 /**
@@ -960,9 +960,9 @@ library class ConditionEvaluator extends ExprEvaluator {
   ConditionEvaluator() { this = 0 }
 
   override predicate interesting(Expr e) {
-    qlCFGFalseSuccessor(e, _)
+    qlCfgFalseSuccessor(e, _)
     or
-    qlCFGTrueSuccessor(e, _)
+    qlCfgTrueSuccessor(e, _)
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
index 895bbdc7e22..e10eb8e15a5 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
@@ -20,10 +20,4 @@ import semmle.code.cpp.dataflow.DataFlow2
 
 module TaintTracking {
   import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl
-  private import semmle.code.cpp.dataflow.TaintTracking2
-
-  /**
-   * DEPRECATED: Use TaintTracking2::Configuration instead.
-   */
-  deprecated class Configuration2 = TaintTracking2::Configuration;
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowVar.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowVar.qll
index c2fe9815836..6a2b087c2e1 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowVar.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowVar.qll
@@ -113,10 +113,6 @@ private module PartialDefinitions {
   abstract class PartialDefinition extends Expr {
     ControlFlowNode node;
 
-    abstract deprecated predicate partiallyDefines(Variable v);
-
-    abstract deprecated predicate partiallyDefinesThis(ThisExpr e);
-
     /**
      * Gets the subBasicBlock where this `PartialDefinition` is defined.
      */
@@ -189,10 +185,6 @@ private module PartialDefinitions {
       )
     }
 
-    deprecated override predicate partiallyDefines(Variable v) { v = collection }
-
-    deprecated override predicate partiallyDefinesThis(ThisExpr e) { none() }
-
     override predicate definesExpressions(Expr inner, Expr outer) {
       inner = innerDefinedExpr and
       outer = this
@@ -217,12 +209,6 @@ private module PartialDefinitions {
 
     VariablePartialDefinition() { innerDefinedExpr = getInnerDefinedExpr(this, node) }
 
-    deprecated override predicate partiallyDefines(Variable v) {
-      innerDefinedExpr = v.getAnAccess()
-    }
-
-    deprecated override predicate partiallyDefinesThis(ThisExpr e) { innerDefinedExpr = e }
-
     /**
      * Holds if this partial definition may modify `inner` (or what it points
      * to) through `outer`. These expressions will never be `Conversion`s.
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Assignment.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Assignment.qll
index 065fae8aa70..fd03220c183 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Assignment.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Assignment.qll
@@ -226,13 +226,6 @@ class AssignPointerSubExpr extends AssignOperation, @assignpsubexpr {
  * ```
  */
 class ConditionDeclExpr extends Expr, @condition_decl {
-  /**
-   * DEPRECATED: Use `getVariableAccess()` or `getInitializingExpr()` instead.
-   *
-   * Gets the access using the condition for this declaration.
-   */
-  deprecated Expr getExpr() { result = this.getChild(0) }
-
   override string getAPrimaryQlClass() { result = "ConditionDeclExpr" }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
index dcbedde4475..309d98cd694 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
@@ -118,11 +118,6 @@ class BuiltInNoOp extends BuiltInOperation, @noopexpr {
   override string getAPrimaryQlClass() { result = "BuiltInNoOp" }
 }
 
-/**
- * DEPRECATED: Use `BuiltInOperationBuiltInOffsetOf` instead.
- */
-deprecated class BuiltInOperationOffsetOf = BuiltInOperationBuiltInOffsetOf;
-
 /**
  * A C/C++ `__builtin_offsetof` built-in operation (used by some implementations
  * of `offsetof`).  The operation retains its semantics even in the presence
@@ -465,11 +460,6 @@ class BuiltInOperationIsUnion extends BuiltInOperation, @isunionexpr {
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsUnion" }
 }
 
-/**
- * DEPRECATED: Use `BuiltInOperationBuiltInTypesCompatibleP` instead.
- */
-deprecated class BuiltInOperationBuiltInTypes = BuiltInOperationBuiltInTypesCompatibleP;
-
 /**
  * A C++ `__builtin_types_compatible_p` built-in operation (used by some
  * implementations of the `<type_traits>` header).
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Cast.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Cast.qll
index 701cfbfd636..3cb8946c198 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Cast.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Cast.qll
@@ -666,13 +666,6 @@ class TypeidOperator extends Expr, @type_id {
    */
   Type getResultType() { typeid_bind(underlyingElement(this), unresolveElement(result)) }
 
-  /**
-   * DEPRECATED: Use `getResultType()` instead.
-   *
-   * Gets the type that is returned by this typeid expression.
-   */
-  deprecated Type getSpecifiedType() { result = this.getResultType() }
-
   override string getAPrimaryQlClass() { result = "TypeidOperator" }
 
   /**
@@ -731,13 +724,6 @@ class SizeofExprOperator extends SizeofOperator {
   /** Gets the contained expression. */
   Expr getExprOperand() { result = this.getChild(0) }
 
-  /**
-   * DEPRECATED: Use `getExprOperand()` instead
-   *
-   * Gets the contained expression.
-   */
-  deprecated Expr getExpr() { result = this.getExprOperand() }
-
   override string toString() { result = "sizeof(<expr>)" }
 
   override predicate mayBeImpure() { this.getExprOperand().mayBeImpure() }
@@ -759,13 +745,6 @@ class SizeofTypeOperator extends SizeofOperator {
   /** Gets the contained type. */
   Type getTypeOperand() { sizeof_bind(underlyingElement(this), unresolveElement(result)) }
 
-  /**
-   * DEPRECATED: Use `getTypeOperand()` instead
-   *
-   * Gets the contained type.
-   */
-  deprecated Type getSpecifiedType() { result = this.getTypeOperand() }
-
   override string toString() { result = "sizeof(" + this.getTypeOperand().getName() + ")" }
 
   override predicate mayBeImpure() { none() }
@@ -794,11 +773,6 @@ class AlignofExprOperator extends AlignofOperator {
    */
   Expr getExprOperand() { result = this.getChild(0) }
 
-  /**
-   * DEPRECATED: Use `getExprOperand()` instead.
-   */
-  deprecated Expr getExpr() { result = this.getExprOperand() }
-
   override string toString() { result = "alignof(<expr>)" }
 }
 
@@ -814,11 +788,6 @@ class AlignofTypeOperator extends AlignofOperator {
   /** Gets the contained type. */
   Type getTypeOperand() { sizeof_bind(underlyingElement(this), unresolveElement(result)) }
 
-  /**
-   * DEPRECATED: Use `getTypeOperand()` instead.
-   */
-  deprecated Type getSpecifiedType() { result = this.getTypeOperand() }
-
   override string toString() { result = "alignof(" + this.getTypeOperand().getName() + ")" }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/ComparisonOperation.qll b/cpp/ql/lib/semmle/code/cpp/exprs/ComparisonOperation.qll
index 5ae0155fdb3..2c6387f1844 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/ComparisonOperation.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/ComparisonOperation.qll
@@ -48,16 +48,6 @@ class NEExpr extends EqualityOperation, @neexpr {
 class RelationalOperation extends ComparisonOperation, @rel_op_expr {
   override int getPrecedence() { result = 10 }
 
-  /**
-   * DEPRECATED: Use `getGreaterOperand()` instead.
-   */
-  deprecated Expr getLarge() { result = getGreaterOperand() }
-
-  /**
-   * DEPRECATED: Use `getLesserOperand()` instead.
-   */
-  deprecated Expr getSmall() { result = getLesserOperand() }
-
   /**
    * Gets the operand on the "greater" (or "greater-or-equal") side
    * of this relational expression, that is, the side that is larger
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
index a10a94f357d..14399078231 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll
@@ -114,13 +114,6 @@ class Expr extends StmtParent, @expr {
    */
   Type getUnspecifiedType() { result = this.getType().getUnspecifiedType() }
 
-  /**
-   * Gets an integer indicating the type of expression that this represents.
-   *
-   * DEPRECATED: use the subclasses of `Expr` rather than relying on this predicate.
-   */
-  deprecated int getKind() { exprs(underlyingElement(this), result, _) }
-
   /** Gets a textual representation of this expression. */
   override string toString() { none() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
index 18ca03740ac..93609763ec3 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll
@@ -164,16 +164,6 @@ class HexLiteral extends Literal {
 class AggregateLiteral extends Expr, @aggregateliteral {
   override string getAPrimaryQlClass() { result = "AggregateLiteral" }
 
-  /**
-   * DEPRECATED: Use ClassAggregateLiteral.getFieldExpr() instead.
-   *
-   * Gets the expression within the aggregate literal that is used to initialise field `f`,
-   * if this literal is being used to initialise a class/struct instance.
-   */
-  deprecated Expr getCorrespondingExpr(Field f) {
-    result = this.(ClassAggregateLiteral).getFieldExpr(f)
-  }
-
   override predicate mayBeImpure() { this.getAChild().mayBeImpure() }
 
   override predicate mayBeGloballyImpure() { this.getAChild().mayBeGloballyImpure() }
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/ObjectiveC.qll b/cpp/ql/lib/semmle/code/cpp/exprs/ObjectiveC.qll
deleted file mode 100644
index c651ae9b153..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/exprs/ObjectiveC.qll
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * DEPRECATED: Objective-C is no longer supported.
- */
-
-import semmle.code.cpp.exprs.Expr
-import semmle.code.cpp.Class
-import semmle.code.cpp.ObjectiveC
-private import semmle.code.cpp.internal.ResolveClass
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C message expression, for example `[myColor changeColorToRed:5.0 green:2.0 blue:6.0]`.
- */
-deprecated class MessageExpr extends Expr, Call {
-  MessageExpr() { none() }
-
-  override string toString() { none() }
-
-  /**
-   * Gets the selector of this message expression, for example `-changeColorToRed:green:blue:`.
-   */
-  string getSelector() { none() }
-
-  /**
-   * Gets the function invoked by this message expression, as inferred by the compiler.
-   *
-   * If the compiler could infer the type of the receiver, and that type had a method
-   * whose name matched the selector, then the result of this predicate is said method.
-   * Otherwise this predicate has no result.
-   *
-   * In all cases, actual function dispatch isn't performed until runtime, but the
-   * lack of a static target is often cause for concern.
-   */
-  MemberFunction getStaticTarget() { none() }
-
-  /**
-   * Provided for compatibility with Call. It is the same as the static target.
-   */
-  override MemberFunction getTarget() { none() }
-
-  /**
-   * Holds if the compiler could infer a function as the target of this message.
-   *
-   * In all cases, actual function dispatch isn't performed until runtime, but the
-   * lack of a static target is often cause for concern.
-   */
-  predicate hasStaticTarget() { none() }
-
-  /**
-   * Gets the number of arguments passed by this message expression.
-   *
-   * In most cases, this equals the number of colons in the selector, but this needn't be the
-   * case for variadic methods like "-initWithFormat:", which can have more than one argument.
-   */
-  override int getNumberOfArguments() { none() }
-
-  /**
-   * Gets an argument passed by this message expression.
-   */
-  override Expr getAnArgument() { none() }
-
-  /**
-   * Gets the nth argument passed by this message expression.
-   *
-   * The range of `n` is [`0` .. `getNumberOfArguments()`].
-   */
-  override Expr getArgument(int n) { none() }
-
-  override int getPrecedence() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C message expression whose receiver is `super`, for example `[super init]`.
- */
-deprecated class SuperMessageExpr extends MessageExpr {
-  SuperMessageExpr() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C message expression whose receiver is the name of a class, and
- * is therefore calling a class method rather than an instance method. This occurs
- * most commonly for the "+alloc", "+new", and "+class" selectors.
- */
-deprecated class ClassMessageExpr extends MessageExpr {
-  ClassMessageExpr() { none() }
-
-  /**
-   * Gets the class which is the receiver of this message.
-   */
-  Type getReceiver() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C message expression whose receiver is an expression (which includes the
- * common case of the receiver being "self").
- */
-deprecated class ExprMessageExpr extends MessageExpr {
-  ExprMessageExpr() { none() }
-
-  /**
-   * Gets the expression which gives the receiver of this message.
-   */
-  Expr getReceiver() { none() }
-
-  /**
-   * Gets the Objective C class of which the receiving expression is an instance.
-   *
-   * If the receiving expression has type `id` or type `id<P>` for some protocol `P`,
-   * then there will be no result. If the receiving expression has type `C*` or type
-   * `C<P>*` for some protocol `P`, then the result will be the type `C`.
-   */
-  ObjectiveClass getReceiverClass() { none() }
-
-  /**
-   * Gets the Objective C classes and/or protocols which are statically implemented
-   * by the receiving expression.
-   *
-   * If the receiving expression has type `id`, then there will be no result.
-   * If the receiving expression has type `id<P>`, then `P` will be the sole result.
-   * If the receiving expression has type `C*`, then `C` will be the sole result.
-   * If the receiving expression has type `C<P>*`, then `C` and `P` will both be results.
-   */
-  Class getAReceiverClassOrProtocol() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An access to an Objective C property using dot syntax.
- *
- * Such accesses are de-sugared into a message expression to the property's getter or setter.
- */
-deprecated class PropertyAccess extends ExprMessageExpr {
-  PropertyAccess() { none() }
-
-  /**
-   * Gets the property being accessed by this expression.
-   */
-  Property getProperty() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@selector` expression, for example `@selector(driveForDistance:)`.
- */
-deprecated class AtSelectorExpr extends Expr {
-  AtSelectorExpr() { none() }
-
-  override string toString() { none() }
-
-  /**
-   * Gets the selector of this `@selector` expression, for example `driveForDistance:`.
-   */
-  string getSelector() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@protocol` expression, for example `@protocol(SomeProtocol)`.
- */
-deprecated class AtProtocolExpr extends Expr {
-  AtProtocolExpr() { none() }
-
-  override string toString() { none() }
-
-  /**
-   * Gets the protocol of this `@protocol` expression, for example `SomeProtocol`.
-   */
-  Protocol getProtocol() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C `@encode` expression, for example `@encode(int *)`.
- */
-deprecated class AtEncodeExpr extends Expr {
-  AtEncodeExpr() { none() }
-
-  override string toString() { none() }
-
-  /**
-   * Gets the type this `@encode` expression encodes, for example `int *`.
-   */
-  Type getEncodedType() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C throw expression.
- */
-deprecated class ObjcThrowExpr extends ThrowExpr {
-  ObjcThrowExpr() { none() }
-
-  override string toString() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C throw expression with no argument (which causes the
- * current exception to be re-thrown).
- */
-deprecated class ObjcReThrowExpr extends ReThrowExpr, ObjcThrowExpr {
-  ObjcReThrowExpr() { none() }
-
-  override string toString() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C @ expression which boxes a single value, such as @(22).
- */
-deprecated class AtExpr extends UnaryOperation {
-  AtExpr() { none() }
-
-  override string toString() { none() }
-
-  override string getOperator() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C @[...] literal.
- */
-deprecated class ArrayLiteral extends Expr {
-  ArrayLiteral() { none() }
-
-  /** Gets a textual representation of this array literal. */
-  override string toString() { none() }
-
-  /** An element of the array */
-  Expr getElement(int i) { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C @{...} literal.
- */
-deprecated class DictionaryLiteral extends Expr {
-  DictionaryLiteral() { none() }
-
-  /** Gets a textual representation of this dictionary literal. */
-  override string toString() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C @"..." string literal.
- */
-deprecated class ObjCLiteralString extends TextLiteral {
-  ObjCLiteralString() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C/C++ overloaded subscripting access expression.
- *
- * Either
- *     obj[idx]
- * or
- *     obj[idx] = expr
- */
-deprecated class SubscriptExpr extends Expr {
-  SubscriptExpr() { none() }
-
-  /**
-   * Gets the object expression being subscripted.
-   */
-  Expr getSubscriptBase() { none() }
-
-  /**
-   * Gets the expression giving the index into the object.
-   */
-  Expr getSubscriptIndex() { none() }
-
-  /**
-   * Gets the expression being assigned (if this is an assignment).
-   */
-  Expr getAssignedExpr() { none() }
-
-  override string toString() { none() }
-}
-
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * An Objective C _cmd expression.
- */
-deprecated class CmdExpr extends Expr {
-  CmdExpr() { none() }
-
-  override string toString() { none() }
-
-  override predicate mayBeImpure() { none() }
-
-  override predicate mayBeGloballyImpure() { none() }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/headers/MultipleInclusion.qll b/cpp/ql/lib/semmle/code/cpp/headers/MultipleInclusion.qll
index 5a12af29694..8698b47ff63 100644
--- a/cpp/ql/lib/semmle/code/cpp/headers/MultipleInclusion.qll
+++ b/cpp/ql/lib/semmle/code/cpp/headers/MultipleInclusion.qll
@@ -39,19 +39,6 @@ class CorrectIncludeGuard extends IncludeGuardedHeader {
   PreprocessorEndif getEndif() { correctIncludeGuard(this, _, _, result, _) }
 }
 
-/**
- * DEPRECATED: no longer useful.
- */
-deprecated class NotIncludedGuard extends IncludeGuardedHeader {
-  NotIncludedGuard() { none() }
-
-  /** Gets the `#ifndef` directive used to prevent multiple inclusion of this file. */
-  PreprocessorIfndef getIfndef() { result.getFile() = this }
-
-  /** Gets the `#endif` directive closing this file. */
-  PreprocessorEndif getEndif() { result.getFile() = this }
-}
-
 /**
  * A file with no code in it.
  */
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
index c6942b7adfe..be5403734ce 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
@@ -129,11 +129,11 @@ private class FromGlobalVarTaintTrackingCfg extends TaintTracking2::Configuratio
 }
 
 private predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 private predicate writesVariable(StoreInstruction store, Variable var) {
-  store.getDestinationAddress().(VariableAddressInstruction).getASTVariable() = var
+  store.getDestinationAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 /**
@@ -489,9 +489,9 @@ module TaintedWithPath {
     /** Gets the element that `pathNode` wraps, if any. */
     Element getElementFromPathNode(PathNode pathNode) {
       exists(DataFlow::Node node | node = pathNode.(WrapPathNode).inner().getNode() |
-        result = node.asInstruction().getAST()
+        result = node.asInstruction().getAst()
         or
-        result = node.asOperand().getDef().getAST()
+        result = node.asOperand().getDef().getAst()
       )
       or
       result = pathNode.(EndpointPathNode).inner()
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/MustFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/MustFlow.qll
new file mode 100644
index 00000000000..1f3ea2a4d3d
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/MustFlow.qll
@@ -0,0 +1,270 @@
+/**
+ * This file provides a library for inter-procedural must-flow data flow analysis.
+ * Unlike `DataFlow.qll`, the analysis provided by this file checks whether data _must_ flow
+ * from a source to a _sink_.
+ */
+
+private import cpp
+import semmle.code.cpp.ir.dataflow.DataFlow
+private import semmle.code.cpp.ir.IR
+
+/**
+ * A configuration of a data flow analysis that performs must-flow analysis. This is different
+ * from `DataFlow.qll` which performs may-flow analysis (i.e., it finds paths where the source _may_
+ * flow to the sink).
+ *
+ * Like in `DataFlow.qll`, each use of the `MustFlow.qll` library must define its own unique extension
+ * of this abstract class. To create a configuration, extend this class with a subclass whose
+ * characteristic predicate is a unique singleton string and override `isSource`, `isSink` (and
+ * `isAdditionalFlowStep` if additional steps are required).
+ */
+abstract class MustFlowConfiguration extends string {
+  bindingset[this]
+  MustFlowConfiguration() { any() }
+
+  /**
+   * Holds if `source` is a relevant data flow source.
+   */
+  abstract predicate isSource(DataFlow::Node source);
+
+  /**
+   * Holds if `sink` is a relevant data flow sink.
+   */
+  abstract predicate isSink(DataFlow::Node sink);
+
+  /**
+   * Holds if the additional flow step from `node1` to `node2` must be taken
+   * into account in the analysis.
+   */
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
+
+  /**
+   * Holds if data must flow from `source` to `sink` for this configuration.
+   *
+   * The corresponding paths are generated from the end-points and the graph
+   * included in the module `PathGraph`.
+   */
+  final predicate hasFlowPath(MustFlowPathNode source, MustFlowPathSink sink) {
+    this.isSource(source.getNode()) and
+    source.getASuccessor+() = sink
+  }
+}
+
+/** Holds if `node` flows from a source. */
+pragma[nomagic]
+private predicate flowsFromSource(DataFlow::Node node, MustFlowConfiguration config) {
+  config.isSource(node)
+  or
+  exists(DataFlow::Node mid |
+    step(mid, node, config) and
+    flowsFromSource(mid, pragma[only_bind_into](config))
+  )
+}
+
+/** Holds if `node` flows to a sink. */
+pragma[nomagic]
+private predicate flowsToSink(DataFlow::Node node, MustFlowConfiguration config) {
+  flowsFromSource(node, pragma[only_bind_into](config)) and
+  (
+    config.isSink(node)
+    or
+    exists(DataFlow::Node mid |
+      step(node, mid, config) and
+      flowsToSink(mid, pragma[only_bind_into](config))
+    )
+  )
+}
+
+cached
+private module Cached {
+  /** Holds if `p` is the `n`'th parameter of the non-virtual function `f`. */
+  private predicate parameterOf(Parameter p, Function f, int n) {
+    not f.isVirtual() and f.getParameter(n) = p
+  }
+
+  /**
+   * Holds if `instr` is the `n`'th argument to a call to the non-virtual function `f`, and
+   * `init` is the corresponding initialization instruction that receives the value of `instr` in `f`.
+   */
+  private predicate flowIntoParameter(
+    Function f, int n, CallInstruction call, Instruction instr, InitializeParameterInstruction init
+  ) {
+    not f.isVirtual() and
+    call.getPositionalArgument(n) = instr and
+    f = call.getStaticCallTarget() and
+    getEnclosingNonVirtualFunctionInitializeParameter(init, f) and
+    init.getParameter().getIndex() = pragma[only_bind_into](pragma[only_bind_out](n))
+  }
+
+  /**
+   * Holds if `instr` is an argument to a call to the function `f`, and `init` is the
+   * corresponding initialization instruction that receives the value of `instr` in `f`.
+   */
+  pragma[noinline]
+  private predicate getPositionalArgumentInitParam(
+    CallInstruction call, Instruction instr, InitializeParameterInstruction init, Function f
+  ) {
+    exists(int n |
+      parameterOf(_, f, n) and
+      flowIntoParameter(f, pragma[only_bind_into](pragma[only_bind_out](n)), call, instr, init)
+    )
+  }
+
+  /**
+   * Holds if `instr` is the qualifier to a call to the non-virtual function `f`, and
+   * `init` is the corresponding initialization instruction that receives the value of
+   * `instr` in `f`.
+   */
+  pragma[noinline]
+  private predicate getThisArgumentInitParam(
+    CallInstruction call, Instruction instr, InitializeParameterInstruction init, Function f
+  ) {
+    not f.isVirtual() and
+    call.getStaticCallTarget() = f and
+    getEnclosingNonVirtualFunctionInitializeParameter(init, f) and
+    call.getThisArgument() = instr and
+    init.getIRVariable() instanceof IRThisVariable
+  }
+
+  /** Holds if `f` is the enclosing non-virtual function of `init`. */
+  private predicate getEnclosingNonVirtualFunctionInitializeParameter(
+    InitializeParameterInstruction init, Function f
+  ) {
+    not f.isVirtual() and
+    init.getEnclosingFunction() = f
+  }
+
+  /** Holds if `f` is the enclosing non-virtual function of `init`. */
+  private predicate getEnclosingNonVirtualFunctionInitializeIndirection(
+    InitializeIndirectionInstruction init, Function f
+  ) {
+    not f.isVirtual() and
+    init.getEnclosingFunction() = f
+  }
+
+  /**
+   * Holds if `instr` is an argument (or argument indirection) to a call, and
+   * `succ` is the corresponding initialization instruction in the call target.
+   */
+  private predicate flowThroughCallable(Instruction argument, Instruction parameter) {
+    // Flow from an argument to a parameter
+    exists(CallInstruction call, InitializeParameterInstruction init | init = parameter |
+      getPositionalArgumentInitParam(call, argument, init, call.getStaticCallTarget())
+      or
+      getThisArgumentInitParam(call, argument, init, call.getStaticCallTarget())
+    )
+    or
+    // Flow from argument indirection to parameter indirection
+    exists(
+      CallInstruction call, ReadSideEffectInstruction read, InitializeIndirectionInstruction init
+    |
+      init = parameter and
+      read.getPrimaryInstruction() = call and
+      getEnclosingNonVirtualFunctionInitializeIndirection(init, call.getStaticCallTarget())
+    |
+      exists(int n |
+        read.getSideEffectOperand().getAnyDef() = argument and
+        read.getIndex() = pragma[only_bind_into](n) and
+        init.getParameter().getIndex() = pragma[only_bind_into](n)
+      )
+      or
+      call.getThisArgument() = argument and
+      init.getIRVariable() instanceof IRThisVariable
+    )
+  }
+
+  private predicate instructionToOperandStep(Instruction instr, Operand operand) {
+    operand.getDef() = instr
+  }
+
+  /**
+   * Holds if data flows from `operand` to `instr`.
+   *
+   * This predicate ignores flow through `PhiInstruction`s to create a 'must flow' relation.
+   */
+  private predicate operandToInstructionStep(Operand operand, Instruction instr) {
+    instr.(CopyInstruction).getSourceValueOperand() = operand
+    or
+    instr.(ConvertInstruction).getUnaryOperand() = operand
+    or
+    instr.(CheckedConvertOrNullInstruction).getUnaryOperand() = operand
+    or
+    instr.(InheritanceConversionInstruction).getUnaryOperand() = operand
+    or
+    instr.(ChiInstruction).getTotalOperand() = operand
+  }
+
+  cached
+  predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    instructionToOperandStep(nodeFrom.asInstruction(), nodeTo.asOperand())
+    or
+    flowThroughCallable(nodeFrom.asInstruction(), nodeTo.asInstruction())
+    or
+    operandToInstructionStep(nodeFrom.asOperand(), nodeTo.asInstruction())
+  }
+}
+
+/** Holds if `nodeFrom` flows to `nodeTo`. */
+private predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo, MustFlowConfiguration config) {
+  exists(config) and
+  Cached::step(nodeFrom, nodeTo)
+  or
+  config.isAdditionalFlowStep(nodeFrom, nodeTo)
+}
+
+private newtype TLocalPathNode =
+  MkLocalPathNode(DataFlow::Node n, MustFlowConfiguration config) {
+    flowsToSink(n, config) and
+    (
+      config.isSource(n)
+      or
+      exists(MustFlowPathNode mid | step(mid.getNode(), n, config))
+    )
+  }
+
+/** A `Node` that is in a path from a source to a sink. */
+class MustFlowPathNode extends TLocalPathNode {
+  DataFlow::Node n;
+
+  MustFlowPathNode() { this = MkLocalPathNode(n, _) }
+
+  /** Gets the underlying node. */
+  DataFlow::Node getNode() { result = n }
+
+  /** Gets a textual representation of this node. */
+  string toString() { result = n.toString() }
+
+  /** Gets the location of this element. */
+  Location getLocation() { result = n.getLocation() }
+
+  /** Gets a successor node, if any. */
+  MustFlowPathNode getASuccessor() {
+    step(this.getNode(), result.getNode(), this.getConfiguration())
+  }
+
+  /** Gets the associated configuration. */
+  MustFlowConfiguration getConfiguration() { this = MkLocalPathNode(_, result) }
+}
+
+private class MustFlowPathSink extends MustFlowPathNode {
+  MustFlowPathSink() { this.getConfiguration().isSink(this.getNode()) }
+}
+
+/**
+ * Provides the query predicates needed to include a graph in a path-problem query.
+ */
+module PathGraph {
+  private predicate reach(MustFlowPathNode n) {
+    n instanceof MustFlowPathSink or reach(n.getASuccessor())
+  }
+
+  /** Holds if `(a,b)` is an edge in the graph of data flow path explanations. */
+  query predicate edges(MustFlowPathNode a, MustFlowPathNode b) {
+    a.getASuccessor() = b and reach(b)
+  }
+
+  /** Holds if `n` is a node in the graph of data flow path explanations. */
+  query predicate nodes(MustFlowPathNode n, string key, string val) {
+    reach(n) and key = "semmle.label" and val = n.toString()
+  }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll
index f25386d3ba8..bcf2fa8c7db 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll
@@ -17,7 +17,7 @@ private import semmle.code.cpp.ir.IR
  */
 Function resolveCall(Call call) {
   exists(CallInstruction callInstruction |
-    callInstruction.getAST() = call and
+    callInstruction.getAst() = call and
     result = viableCallable(callInstruction)
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
index c95fcd3f574..7eada0bb244 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
@@ -20,10 +20,4 @@ import semmle.code.cpp.ir.dataflow.DataFlow2
 
 module TaintTracking {
   import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl
-  private import semmle.code.cpp.ir.dataflow.TaintTracking2
-
-  /**
-   * DEPRECATED: Use TaintTracking2::Configuration instead.
-   */
-  deprecated class Configuration2 = TaintTracking2::Configuration;
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
index 509ee01ec07..c0bdb656e0e 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -116,12 +116,12 @@ private module VirtualDispatch {
   /** Holds if `addressInstr` is an instruction that produces the address of `var`. */
   private predicate addressOfGlobal(Instruction addressInstr, GlobalOrNamespaceVariable var) {
     // Access directly to the global variable
-    addressInstr.(VariableAddressInstruction).getASTVariable() = var
+    addressInstr.(VariableAddressInstruction).getAstVariable() = var
     or
     // Access to a field on a global union
     exists(FieldAddressInstruction fa |
       fa = addressInstr and
-      fa.getObjectAddress().(VariableAddressInstruction).getASTVariable() = var and
+      fa.getObjectAddress().(VariableAddressInstruction).getAstVariable() = var and
       fa.getField().getDeclaringType() instanceof Union
     )
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
index 75b530e937d..c629550bc3a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -158,14 +158,6 @@ class Node extends TIRDataFlowNode {
    */
   Expr asPartialDefinition() { result = this.(PartialDefinitionNode).getDefinedExpr() }
 
-  /**
-   * DEPRECATED: See UninitializedNode.
-   *
-   * Gets the uninitialized local variable corresponding to this node, if
-   * any.
-   */
-  deprecated LocalVariable asUninitialized() { none() }
-
   /**
    * Gets an upper bound on the type of this node.
    */
@@ -439,7 +431,7 @@ class SsaPhiNode extends Node, TSsaPhiNode {
 
   SsaPhiNode() { this = TSsaPhiNode(phi) }
 
-  /* Get the phi node associated with this node. */
+  /** Gets the phi node associated with this node. */
   Ssa::PhiNode getPhiNode() { result = phi }
 
   override Declaration getEnclosingCallable() { result = this.getFunction() }
@@ -560,22 +552,6 @@ class ParameterIndirectionNode extends ParameterNode {
   override string toString() { result = "*" + instr.getIRVariable().toString() }
 }
 
-/**
- * DEPRECATED: Data flow was never an accurate way to determine what
- * expressions might be uninitialized. It errs on the side of saying that
- * everything is uninitialized, and this is even worse in the IR because the IR
- * doesn't use syntactic hints to rule out variables that are definitely
- * initialized.
- *
- * The value of an uninitialized local variable, viewed as a node in a data
- * flow graph.
- */
-deprecated class UninitializedNode extends Node {
-  UninitializedNode() { none() }
-
-  LocalVariable getLocalVariable() { none() }
-}
-
 /**
  * A node associated with an object after an operation that might have
  * changed its state.
@@ -725,14 +701,6 @@ InstructionNode instructionNode(Instruction instr) { result.getInstruction() = i
  */
 OperandNode operandNode(Operand operand) { result.getOperand() = operand }
 
-/**
- * DEPRECATED: use `definitionByReferenceNodeFromArgument` instead.
- *
- * Gets the `Node` corresponding to a definition by reference of the variable
- * that is passed as `argument` of a call.
- */
-deprecated DefinitionByReferenceNode definitionByReferenceNode(Expr e) { result.getArgument() = e }
-
 /**
  * Gets the `Node` corresponding to the value of evaluating `e` or any of its
  * conversions. There is no result if `e` is a `Conversion`. For data flowing
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
index 19bf1d4f27d..eed0d050735 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
@@ -287,20 +287,6 @@ private module SsaDefReaches {
     )
   }
 
-  /**
-   * Holds if the SSA definition of `v` at `def` reaches uncertain SSA definition
-   * `redef` in the same basic block, without crossing another SSA definition of `v`.
-   */
-  predicate ssaDefReachesUncertainDefWithinBlock(
-    SourceVariable v, Definition def, UncertainWriteDefinition redef
-  ) {
-    exists(BasicBlock bb, int rnk, int i |
-      ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaDef()) - 1 and
-      redef.definesAt(v, bb, i)
-    )
-  }
-
   /**
    * Same as `ssaRefRank()`, but restricted to a particular SSA definition `def`.
    */
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
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 1c2cc493338..e5a908bbf9a 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
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll
index 8ba91d70087..7e12ebc1c90 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll
@@ -2,12 +2,12 @@ private import AliasConfigurationInternal
 private import semmle.code.cpp.ir.implementation.unaliased_ssa.IR
 private import cpp
 private import AliasAnalysis
-private import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SimpleSSA as UnaliasedSSA
+private import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SimpleSSA as UnaliasedSsa
 
 private newtype TAllocation =
   TVariableAllocation(IRVariable var) {
     // Only model variables that were not already handled in unaliased SSA.
-    not UnaliasedSSA::canReuseSSAForVariable(var)
+    not UnaliasedSsa::canReuseSsaForVariable(var)
   } or
   TIndirectParameterAllocation(IRAutomaticVariable var) {
     exists(InitializeIndirectionInstruction instr | instr.getIRVariable() = var)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
index acdae2b758a..76a99026d59 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
@@ -133,7 +133,10 @@ abstract class MemoryLocation extends TMemoryLocation {
    */
   predicate isAlwaysAllocatedOnStack() { none() }
 
-  final predicate canReuseSSA() { none() }
+  final predicate canReuseSsa() { none() }
+
+  /** DEPRECATED: Alias for canReuseSsa */
+  deprecated predicate canReuseSSA() { canReuseSsa() }
 }
 
 /**
@@ -569,13 +572,16 @@ private Overlap getVariableMemoryLocationOverlap(
  * Holds if the def/use information for the result of `instr` can be reused from the previous
  * iteration of the IR.
  */
-predicate canReuseSSAForOldResult(Instruction instr) { OldSSA::canReuseSSAForMemoryResult(instr) }
+predicate canReuseSsaForOldResult(Instruction instr) { OldSSA::canReuseSsaForMemoryResult(instr) }
+
+/** DEPRECATED: Alias for canReuseSsaForOldResult */
+deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
 
 bindingset[result, b]
 private boolean unbindBool(boolean b) { result != b.booleanNot() }
 
 MemoryLocation getResultMemoryLocation(Instruction instr) {
-  not canReuseSSAForOldResult(instr) and
+  not canReuseSsaForOldResult(instr) and
   exists(MemoryAccessKind kind, boolean isMayAccess |
     kind = instr.getResultMemoryAccess() and
     (if instr.hasResultMayMemoryAccess() then isMayAccess = true else isMayAccess = false) and
@@ -608,7 +614,7 @@ MemoryLocation getResultMemoryLocation(Instruction instr) {
 }
 
 MemoryLocation getOperandMemoryLocation(MemoryOperand operand) {
-  not canReuseSSAForOldResult(operand.getAnyDef()) and
+  not canReuseSsaForOldResult(operand.getAnyDef()) and
   exists(MemoryAccessKind kind, boolean isMayAccess |
     kind = operand.getMemoryAccess() and
     (if operand.hasMayReadMemoryAccess() then isMayAccess = true else isMayAccess = false) and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll
index b47c20e97ef..c7a5389901b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll
@@ -1,2 +1,2 @@
 private import semmle.code.cpp.ir.implementation.internal.TOperand
-import AliasedSSAOperands
+import AliasedSsaOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
index 72bb239c153..c7487872512 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
@@ -2,7 +2,7 @@ private import SSAConstructionInternal
 private import OldIR
 private import Alias
 private import SSAConstruction
-private import DebugSSA
+private import DebugSsa
 
 bindingset[offset]
 private string getKeySuffixForOffset(int offset) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll
index 5686bb439eb..1c75529be00 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll
@@ -1,2 +1,2 @@
 private import SSAConstruction as SSA
-import SSA::SSAConsistency
+import SSA::SsaConsistency
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
index 5092e921cb3..13ec2ca4ca4 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
@@ -112,7 +112,7 @@ private module Cached {
     exists(Alias::getResultMemoryLocation(oldInstruction))
     or
     // This result was already modeled by a previous iteration of SSA.
-    Alias::canReuseSSAForOldResult(oldInstruction)
+    Alias::canReuseSsaForOldResult(oldInstruction)
   }
 
   cached
@@ -182,7 +182,7 @@ private module Cached {
    * unreachable, this predicate will recurse through any degenerate `Phi` instructions to find the
    * true definition.
    */
-  private Instruction getNewDefinitionFromOldSSA(OldIR::MemoryOperand oldOperand, Overlap overlap) {
+  private Instruction getNewDefinitionFromOldSsa(OldIR::MemoryOperand oldOperand, Overlap overlap) {
     exists(Overlap originalOverlap |
       originalOverlap = oldOperand.getDefinitionOverlap() and
       (
@@ -191,7 +191,7 @@ private module Cached {
         or
         exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
           phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
-          result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
+          result = getNewDefinitionFromOldSsa(phiOperand, phiOperandOverlap) and
           overlap =
             combineOverlap(pragma[only_bind_out](phiOperandOverlap),
               pragma[only_bind_out](originalOverlap))
@@ -233,7 +233,7 @@ private module Cached {
     )
     or
     exists(OldIR::NonPhiMemoryOperand oldOperand |
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap) and
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap) and
       oldOperand.getUse() = instruction and
       tag = oldOperand.getOperandTag()
     )
@@ -307,13 +307,13 @@ private module Cached {
    * Gets the new definition instruction for the operand of `instr` that flows from the block
    * `newPredecessorBlock`, based on that operand's definition in the old IR.
    */
-  private Instruction getNewPhiOperandDefinitionFromOldSSA(
+  private Instruction getNewPhiOperandDefinitionFromOldSsa(
     Instruction instr, IRBlock newPredecessorBlock, Overlap overlap
   ) {
     exists(OldIR::PhiInstruction oldPhi, OldIR::PhiInputOperand oldOperand |
       oldPhi = getOldInstruction(instr) and
       oldOperand = oldPhi.getInputOperand(getOldBlock(newPredecessorBlock)) and
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap)
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap)
     )
   }
 
@@ -333,7 +333,7 @@ private module Cached {
       overlap = Alias::getOverlap(actualDefLocation, useLocation)
     )
     or
-    result = getNewPhiOperandDefinitionFromOldSSA(instr, newPredecessorBlock, overlap)
+    result = getNewPhiOperandDefinitionFromOldSsa(instr, newPredecessorBlock, overlap)
   }
 
   cached
@@ -412,17 +412,17 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instr) {
-    result = getOldInstruction(instr).getAST()
+  Language::AST getInstructionAst(Instruction instr) {
+    result = getOldInstruction(instr).getAst()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(blockStartInstr, _) and
-      result = blockStartInstr.getAST()
+      result = blockStartInstr.getAst()
     )
     or
     exists(RawIR::Instruction primaryInstr |
       instr = chiInstruction(primaryInstr) and
-      result = primaryInstr.getAST()
+      result = primaryInstr.getAst()
     )
     or
     exists(IRFunctionBase irFunc |
@@ -430,6 +430,12 @@ private module Cached {
     )
   }
 
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instr) {
+    result = getInstructionAst(instr)
+  }
+
   cached
   Language::LanguageType getInstructionResultType(Instruction instr) {
     result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -975,35 +981,41 @@ module DefUse {
   }
 }
 
-predicate canReuseSSAForMemoryResult(Instruction instruction) {
+predicate canReuseSsaForMemoryResult(Instruction instruction) {
   exists(OldInstruction oldInstruction |
     oldInstruction = getOldInstruction(instruction) and
     (
       // The previous iteration said it was reusable, so we should mark it as reusable as well.
-      Alias::canReuseSSAForOldResult(oldInstruction)
+      Alias::canReuseSsaForOldResult(oldInstruction)
       or
       // The current alias analysis says it is reusable.
-      Alias::getResultMemoryLocation(oldInstruction).canReuseSSA()
+      Alias::getResultMemoryLocation(oldInstruction).canReuseSsa()
     )
   )
   or
   exists(Alias::MemoryLocation defLocation |
     // This is a `Phi` for a reusable location, so the result of the `Phi` is reusable as well.
     instruction = phiInstruction(_, defLocation) and
-    defLocation.canReuseSSA()
+    defLocation.canReuseSsa()
   )
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
+deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
+
 /**
  * Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
  * `DebugSSA` module, which is then imported by PrintSSA.
  */
-module DebugSSA {
+module DebugSsa {
   import PhiInsertion
   import DefUse
 }
 
+/** DEPRECATED: Alias for DebugSsa */
+deprecated module DebugSSA = DebugSsa;
+
 import CachedForDebugging
 
 cached
@@ -1038,7 +1050,7 @@ private module CachedForDebugging {
 
   private OldIR::IRTempVariable getOldTempVariable(IRTempVariable var) {
     result.getEnclosingFunction() = var.getEnclosingFunction() and
-    result.getAST() = var.getAST() and
+    result.getAst() = var.getAst() and
     result.getTag() = var.getTag()
   }
 
@@ -1061,7 +1073,7 @@ private module CachedForDebugging {
   int maxValue() { result = 2147483647 }
 }
 
-module SSAConsistency {
+module SsaConsistency {
   /**
    * Holds if a `MemoryOperand` has more than one `MemoryLocation` assigned by alias analysis.
    */
@@ -1114,6 +1126,9 @@ module SSAConsistency {
   }
 }
 
+/** DEPRECATED: Alias for SsaConsistency */
+deprecated module SSAConsistency = SsaConsistency;
+
 /**
  * Provides the portion of the parameterized IR interface that is used to construct the SSA stages
  * of the IR. The raw stage of the IR does not expose these predicates.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
index a1ce2629cc2..74919a57870 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
@@ -2,7 +2,7 @@ import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as OldIR
 import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.ReachableBlock as Reachability
 import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.Dominance as Dominance
 import semmle.code.cpp.ir.implementation.aliased_ssa.IR as NewIR
-import semmle.code.cpp.ir.implementation.internal.TInstruction::AliasedSSAInstructions as SSAInstructions
+import semmle.code.cpp.ir.implementation.internal.TInstruction::AliasedSsaInstructions as SSAInstructions
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import AliasedSSA as Alias
-import semmle.code.cpp.ir.implementation.internal.TOperand::AliasedSSAOperands as SSAOperands
+import semmle.code.cpp.ir.implementation.internal.TOperand::AliasedSsaOperands as SSAOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll
index 4b3f19cbdde..5a7099d9fa2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll
@@ -19,24 +19,24 @@ newtype TInstruction =
   ) {
     IRConstruction::Raw::hasInstruction(tag1, tag2)
   } or
-  TUnaliasedSSAPhiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+  TUnaliasedSsaPhiInstruction(
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    UnaliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
+    UnaliasedSsa::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TUnaliasedSSAChiInstruction(TRawInstruction primaryInstruction) { none() } or
-  TUnaliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
-    UnaliasedSSA::SSA::hasUnreachedInstruction(irFunc)
+  TUnaliasedSsaChiInstruction(TRawInstruction primaryInstruction) { none() } or
+  TUnaliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
+    UnaliasedSsa::SSA::hasUnreachedInstruction(irFunc)
   } or
-  TAliasedSSAPhiInstruction(
+  TAliasedSsaPhiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
     AliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TAliasedSSAChiInstruction(TRawInstruction primaryInstruction) {
+  TAliasedSsaChiInstruction(TRawInstruction primaryInstruction) {
     AliasedSSA::SSA::hasChiInstruction(primaryInstruction)
   } or
-  TAliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
+  TAliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
     AliasedSSA::SSA::hasUnreachedInstruction(irFunc)
   }
 
@@ -46,58 +46,64 @@ newtype TInstruction =
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAInstructions {
-  class TPhiInstruction = TUnaliasedSSAPhiInstruction;
+module UnaliasedSsaInstructions {
+  class TPhiInstruction = TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TRawInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) { none() }
 
-  class TChiInstruction = TUnaliasedSSAChiInstruction;
+  class TChiInstruction = TUnaliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TUnaliasedSSAChiInstruction(primaryInstruction)
+    result = TUnaliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TUnaliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TUnaliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TUnaliasedSSAUnreachedInstruction(irFunc)
+    result = TUnaliasedSsaUnreachedInstruction(irFunc)
   }
 }
 
+/** DEPRECATED: Alias for UnaliasedSsaInstructions */
+deprecated module UnaliasedSSAInstructions = UnaliasedSsaInstructions;
+
 /**
  * Provides wrappers for the constructors of each branch of `TInstruction` that is used by the
  * aliased SSA stage.
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module AliasedSSAInstructions {
-  class TPhiInstruction = TAliasedSSAPhiInstruction or TUnaliasedSSAPhiInstruction;
+module AliasedSsaInstructions {
+  class TPhiInstruction = TAliasedSsaPhiInstruction or TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
-    result = TAliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TAliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TPhiInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, _)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, _)
   }
 
-  class TChiInstruction = TAliasedSSAChiInstruction;
+  class TChiInstruction = TAliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TAliasedSSAChiInstruction(primaryInstruction)
+    result = TAliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TAliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TAliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TAliasedSSAUnreachedInstruction(irFunc)
+    result = TAliasedSsaUnreachedInstruction(irFunc)
   }
 }
+
+/** DEPRECATED: Alias for AliasedSsaInstructions */
+deprecated module AliasedSSAInstructions = AliasedSsaInstructions;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
index adaaaca9cd8..2c9ac1c4b80 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
@@ -1,4 +1,4 @@
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as IRConstruction
-import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSSA
+import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSsa
 import semmle.code.cpp.ir.implementation.aliased_ssa.internal.SSAConstruction as AliasedSSA
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll
index e86494af03a..bc69754fe32 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll
@@ -31,7 +31,7 @@ private module Internal {
     TNoOperand() { none() } or
     // Can be "removed" later when there's unreachable code
     // These operands can be reused across all three stages. They just get different defs.
-    TNonSSAMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
+    TNonSsaMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
       // Has no definition in raw but will get definitions later
       useInstr.getOpcode().hasOperand(tag)
     } or
@@ -49,11 +49,11 @@ private module Internal {
     // important that we use the same definition of "is variable aliased" across
     // the phases.
     TAliasedPhiOperand(
-      TAliasedSSAPhiInstruction useInstr, Aliased::IRBlock predecessorBlock, Overlap overlap
+      TAliasedSsaPhiInstruction useInstr, Aliased::IRBlock predecessorBlock, Overlap overlap
     ) {
       exists(AliasedConstruction::getPhiOperandDefinition(useInstr, predecessorBlock, overlap))
     } or
-    TAliasedChiOperand(TAliasedSSAChiInstruction useInstr, ChiOperandTag tag) { any() }
+    TAliasedChiOperand(TAliasedSsaChiInstruction useInstr, ChiOperandTag tag) { any() }
 }
 
 /**
@@ -72,13 +72,21 @@ private module Shared {
     result = Internal::TRegisterOperand(useInstr, tag, defInstr)
   }
 
-  class TNonSSAMemoryOperand = Internal::TNonSSAMemoryOperand;
+  class TNonSsaMemoryOperand = Internal::TNonSsaMemoryOperand;
+
+  /** DEPRECATED: Alias for TNonSsaMemoryOperand */
+  deprecated class TNonSSAMemoryOperand = TNonSsaMemoryOperand;
 
   /**
    * Returns the non-Phi memory operand with the specified parameters.
    */
-  TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
-    result = Internal::TNonSSAMemoryOperand(useInstr, tag)
+  TNonSsaMemoryOperand nonSsaMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = Internal::TNonSsaMemoryOperand(useInstr, tag)
+  }
+
+  /** DEPRECATED: Alias for nonSsaMemoryOperand */
+  deprecated TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = nonSsaMemoryOperand(useInstr, tag)
   }
 }
 
@@ -95,7 +103,7 @@ module RawOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -126,14 +134,14 @@ module RawOperands {
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAOperands {
+module UnaliasedSsaOperands {
   import Shared
 
   class TPhiOperand = Internal::TUnaliasedPhiOperand;
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -159,20 +167,23 @@ module UnaliasedSSAOperands {
   TChiOperand chiOperand(Unaliased::Instruction useInstr, ChiOperandTag tag) { none() }
 }
 
+/** DEPRECATED: Alias for UnaliasedSsaOperands */
+deprecated module UnaliasedSSAOperands = UnaliasedSsaOperands;
+
 /**
  * Provides wrappers for the constructors of each branch of `TOperand` that is used by the
  * asliased SSA stage.
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module AliasedSSAOperands {
+module AliasedSsaOperands {
   import Shared
 
   class TPhiOperand = Internal::TAliasedPhiOperand or Internal::TUnaliasedPhiOperand;
 
   class TChiOperand = Internal::TAliasedChiOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -202,7 +213,10 @@ module AliasedSSAOperands {
   /**
    * Returns the Chi operand with the specified parameters.
    */
-  TChiOperand chiOperand(TAliasedSSAChiInstruction useInstr, ChiOperandTag tag) {
+  TChiOperand chiOperand(TAliasedSsaChiInstruction useInstr, ChiOperandTag tag) {
     result = Internal::TAliasedChiOperand(useInstr, tag)
   }
 }
+
+/** DEPRECATED: Alias for AliasedSsaOperands */
+deprecated module AliasedSSAOperands = AliasedSsaOperands;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
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 1c2cc493338..e5a908bbf9a 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
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
index e8fcf3fcdf3..16158a4c73a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
@@ -48,7 +48,7 @@ module Raw {
   cached
   predicate hasTempVariable(Function func, Locatable ast, TempVariableTag tag, CppType type) {
     exists(TranslatedElement element |
-      element.getAST() = ast and
+      element.getAst() = ast and
       func = element.getFunction() and
       element.hasTempVariable(tag, type)
     )
@@ -75,7 +75,7 @@ module Raw {
       tag = getInstructionTag(instruction) and
       (
         result = element.getInstructionVariable(tag) or
-        result.(IRStringLiteral).getAST() = element.getInstructionStringLiteral(tag)
+        result.(IRStringLiteral).getAst() = element.getInstructionStringLiteral(tag)
       )
     )
   }
@@ -339,7 +339,7 @@ Instruction getInstructionBackEdgeSuccessor(Instruction instruction, EdgeKind ki
   // such a `goto` creates a back edge.
   exists(TranslatedElement s, GotoStmt goto |
     not isStrictlyForwardGoto(goto) and
-    goto = s.getAST() and
+    goto = s.getAst() and
     exists(InstructionTag tag |
       result = s.getInstructionSuccessor(tag, kind) and
       instruction = s.getInstruction(tag)
@@ -352,8 +352,13 @@ private predicate isStrictlyForwardGoto(GotoStmt goto) {
   goto.getLocation().isBefore(goto.getTarget().getLocation())
 }
 
-Locatable getInstructionAST(TStageInstruction instr) {
-  result = getInstructionTranslatedElement(instr).getAST()
+Locatable getInstructionAst(TStageInstruction instr) {
+  result = getInstructionTranslatedElement(instr).getAst()
+}
+
+/** DEPRECATED: Alias for getInstructionAst */
+deprecated Locatable getInstructionAST(TStageInstruction instr) {
+  result = getInstructionAst(instr)
 }
 
 CppType getInstructionResultType(TStageInstruction instr) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
index 8ef5334b598..66c601736af 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
@@ -175,7 +175,10 @@ abstract class TranslatedSideEffects extends TranslatedElement {
   /** Gets the expression whose side effects are being modeled. */
   abstract Expr getExpr();
 
-  final override Locatable getAST() { result = getExpr() }
+  final override Locatable getAst() { result = getExpr() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = getExpr().getEnclosingFunction() }
 
@@ -522,7 +525,10 @@ class TranslatedArgumentExprSideEffect extends TranslatedArgumentSideEffect,
     this = TTranslatedArgumentExprSideEffect(call, arg, index, sideEffectOpcode)
   }
 
-  final override Locatable getAST() { result = arg }
+  final override Locatable getAst() { result = arg }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Type getIndirectionType() {
     result = arg.getUnspecifiedType().(DerivedType).getBaseType()
@@ -553,7 +559,10 @@ class TranslatedStructorQualifierSideEffect extends TranslatedArgumentSideEffect
     index = -1
   }
 
-  final override Locatable getAST() { result = call }
+  final override Locatable getAst() { result = call }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Type getIndirectionType() { result = call.getTarget().getDeclaringType() }
 
@@ -574,7 +583,10 @@ class TranslatedCallSideEffect extends TranslatedSideEffect, TTranslatedCallSide
 
   TranslatedCallSideEffect() { this = TTranslatedCallSideEffect(expr, sideEffectOpcode) }
 
-  override Locatable getAST() { result = expr }
+  override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Expr getPrimaryExpr() { result = expr }
 
@@ -612,7 +624,10 @@ class TranslatedAllocationSideEffect extends TranslatedSideEffect, TTranslatedAl
 
   TranslatedAllocationSideEffect() { this = TTranslatedAllocationSideEffect(expr) }
 
-  override Locatable getAST() { result = expr }
+  override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Expr getPrimaryExpr() { result = expr }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
index 0779d6fbda5..528acf4498b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
@@ -19,7 +19,10 @@ abstract class TranslatedCondition extends TranslatedElement {
 
   final override string toString() { result = expr.toString() }
 
-  final override Locatable getAST() { result = expr }
+  final override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final ConditionContext getConditionContext() { result = getParent() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
index de63b81c876..36f1ce9443d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
@@ -14,7 +14,7 @@ private import TranslatedInitialization
  * `entry`.
  */
 TranslatedDeclarationEntry getTranslatedDeclarationEntry(DeclarationEntry entry) {
-  result.getAST() = entry
+  result.getAst() = entry
 }
 
 /**
@@ -37,7 +37,10 @@ abstract class TranslatedDeclarationEntry extends TranslatedElement, TTranslated
 
   final override string toString() { result = entry.toString() }
 
-  final override Locatable getAST() { result = entry }
+  final override Locatable getAst() { result = entry }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 }
 
 /**
@@ -223,7 +226,10 @@ class TranslatedStaticLocalVariableInitialization extends TranslatedElement,
 
   final override string toString() { result = "init: " + entry.toString() }
 
-  final override Locatable getAST() { result = entry }
+  final override Locatable getAst() { result = entry }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override LocalVariable getVariable() { result = var }
 
@@ -254,7 +260,10 @@ class TranslatedRangeBasedForVariableDeclaration extends TranslatedLocalVariable
 
   override string toString() { result = var.toString() }
 
-  override Locatable getAST() { result = var }
+  override Locatable getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = forStmt.getEnclosingFunction() }
 
@@ -262,7 +271,7 @@ class TranslatedRangeBasedForVariableDeclaration extends TranslatedLocalVariable
 }
 
 TranslatedConditionDecl getTranslatedConditionDecl(ConditionDeclExpr expr) {
-  result.getAST() = expr
+  result.getAst() = expr
 }
 
 /**
@@ -280,7 +289,10 @@ class TranslatedConditionDecl extends TranslatedLocalVariableDeclaration, TTrans
 
   override string toString() { result = "decl: " + conditionDeclExpr.toString() }
 
-  override Locatable getAST() { result = conditionDeclExpr }
+  override Locatable getAst() { result = conditionDeclExpr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = conditionDeclExpr.getEnclosingFunction() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index 8034e9e2bd1..c9ac4d0e6d9 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -31,7 +31,7 @@ IRUserVariable getIRUserVariable(Function func, Variable var) {
 }
 
 IRTempVariable getIRTempVariable(Locatable ast, TempVariableTag tag) {
-  result.getAST() = ast and
+  result.getAst() = ast and
   result.getTag() = tag
 }
 
@@ -730,7 +730,10 @@ abstract class TranslatedElement extends TTranslatedElement {
   /**
    * Gets the AST node being translated.
    */
-  abstract Locatable getAST();
+  abstract Locatable getAst();
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Locatable getAST() { result = getAst() }
 
   /**
    * Get the first instruction to be executed in the evaluation of this element.
@@ -929,16 +932,16 @@ abstract class TranslatedElement extends TTranslatedElement {
    */
   final IRTempVariable getTempVariable(TempVariableTag tag) {
     exists(Locatable ast |
-      result.getAST() = ast and
+      result.getAst() = ast and
       result.getTag() = tag and
-      hasTempVariableAndAST(tag, ast)
+      hasTempVariableAndAst(tag, ast)
     )
   }
 
   pragma[noinline]
-  private predicate hasTempVariableAndAST(TempVariableTag tag, Locatable ast) {
+  private predicate hasTempVariableAndAst(TempVariableTag tag, Locatable ast) {
     hasTempVariable(tag, _) and
-    ast = getAST()
+    ast = getAst()
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
index 1b761a85640..4449b03a84a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -74,7 +74,10 @@ abstract class TranslatedExpr extends TranslatedElement {
     expr.isGLValueCategory()
   }
 
-  final override Locatable getAST() { result = expr }
+  final override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = this.getAst() }
 
   final override Function getFunction() { result = expr.getEnclosingFunction() }
 
@@ -1709,7 +1712,7 @@ abstract class TranslatedAllocationSize extends TranslatedExpr, TTranslatedAlloc
 }
 
 TranslatedAllocationSize getTranslatedAllocationSize(NewOrNewArrayExpr newExpr) {
-  result.getAST() = newExpr
+  result.getAst() = newExpr
 }
 
 /**
@@ -1875,7 +1878,7 @@ class TranslatedAllocatorCall extends TTranslatedAllocatorCall, TranslatedDirect
 }
 
 TranslatedAllocatorCall getTranslatedAllocatorCall(NewOrNewArrayExpr newExpr) {
-  result.getAST() = newExpr
+  result.getAst() = newExpr
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
index 2fa4548fc3c..0f781cb2244 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
@@ -15,7 +15,7 @@ private import VarArgs
 /**
  * Gets the `TranslatedFunction` that represents function `func`.
  */
-TranslatedFunction getTranslatedFunction(Function func) { result.getAST() = func }
+TranslatedFunction getTranslatedFunction(Function func) { result.getAst() = func }
 
 /**
  * Gets the size, in bytes, of the variable used to represent the `...` parameter in a varargs
@@ -65,7 +65,10 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
 
   final override string toString() { result = func.toString() }
 
-  final override Locatable getAST() { result = func }
+  final override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   /**
    * Gets the function being translated.
@@ -344,7 +347,7 @@ TranslatedThisParameter getTranslatedThisParameter(Function func) { result.getFu
 /**
  * Gets the `TranslatedPositionalParameter` that represents parameter `param`.
  */
-TranslatedPositionalParameter getTranslatedParameter(Parameter param) { result.getAST() = param }
+TranslatedPositionalParameter getTranslatedParameter(Parameter param) { result.getAst() = param }
 
 /**
  * Gets the `TranslatedEllipsisParameter` for function `func`, if one exists.
@@ -457,7 +460,10 @@ class TranslatedThisParameter extends TranslatedParameter, TTranslatedThisParame
 
   final override string toString() { result = "this" }
 
-  final override Locatable getAST() { result = func }
+  final override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = func }
 
@@ -489,7 +495,10 @@ class TranslatedPositionalParameter extends TranslatedParameter, TTranslatedPara
 
   final override string toString() { result = param.toString() }
 
-  final override Locatable getAST() { result = param }
+  final override Locatable getAst() { result = param }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() {
     result = param.getFunction() or
@@ -526,7 +535,10 @@ class TranslatedEllipsisParameter extends TranslatedParameter, TTranslatedEllips
 
   final override string toString() { result = "..." }
 
-  final override Locatable getAST() { result = func }
+  final override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = func }
 
@@ -544,7 +556,7 @@ class TranslatedEllipsisParameter extends TranslatedParameter, TTranslatedEllips
 }
 
 private TranslatedConstructorInitList getTranslatedConstructorInitList(Function func) {
-  result.getAST() = func
+  result.getAst() = func
 }
 
 /**
@@ -561,7 +573,10 @@ class TranslatedConstructorInitList extends TranslatedElement, InitializationCon
 
   override string toString() { result = "ctor init: " + func.toString() }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override TranslatedElement getChild(int id) {
     exists(ConstructorFieldInit fieldInit |
@@ -611,7 +626,7 @@ class TranslatedConstructorInitList extends TranslatedElement, InitializationCon
 }
 
 private TranslatedDestructorDestructionList getTranslatedDestructorDestructionList(Function func) {
-  result.getAST() = func
+  result.getAst() = func
 }
 
 /**
@@ -629,7 +644,10 @@ class TranslatedDestructorDestructionList extends TranslatedElement,
 
   override string toString() { result = "dtor destruction: " + func.toString() }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override TranslatedElement getChild(int id) {
     exists(DestructorFieldDestruction fieldDestruction |
@@ -667,14 +685,17 @@ class TranslatedDestructorDestructionList extends TranslatedElement,
   }
 }
 
-TranslatedReadEffects getTranslatedReadEffects(Function func) { result.getAST() = func }
+TranslatedReadEffects getTranslatedReadEffects(Function func) { result.getAst() = func }
 
 class TranslatedReadEffects extends TranslatedElement, TTranslatedReadEffects {
   Function func;
 
   TranslatedReadEffects() { this = TTranslatedReadEffects(func) }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = func }
 
@@ -718,11 +739,11 @@ class TranslatedReadEffects extends TranslatedElement, TTranslatedReadEffects {
 }
 
 private TranslatedThisReadEffect getTranslatedThisReadEffect(Function func) {
-  result.getAST() = func
+  result.getAst() = func
 }
 
 private TranslatedParameterReadEffect getTranslatedParameterReadEffect(Parameter param) {
-  result.getAST() = param
+  result.getAst() = param
 }
 
 abstract class TranslatedReadEffect extends TranslatedElement {
@@ -758,7 +779,10 @@ class TranslatedThisReadEffect extends TranslatedReadEffect, TTranslatedThisRead
 
   TranslatedThisReadEffect() { this = TTranslatedThisReadEffect(func) }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = func }
 
@@ -781,7 +805,10 @@ class TranslatedParameterReadEffect extends TranslatedReadEffect, TTranslatedPar
 
   TranslatedParameterReadEffect() { this = TTranslatedParameterReadEffect(param) }
 
-  override Locatable getAST() { result = param }
+  override Locatable getAst() { result = param }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override string toString() { result = "read effect: " + param.toString() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
index 23d6ad133cf..1a9d7ad9d70 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
@@ -139,7 +139,10 @@ abstract class TranslatedInitialization extends TranslatedElement, TTranslatedIn
 
   final override Function getFunction() { result = expr.getEnclosingFunction() }
 
-  final override Locatable getAST() { result = expr }
+  final override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   /**
    * Gets the expression that is doing the initialization.
@@ -461,11 +464,11 @@ class TranslatedConstructorInitialization extends TranslatedDirectInitialization
 TranslatedFieldInitialization getTranslatedFieldInitialization(
   ClassAggregateLiteral initList, Field field
 ) {
-  result.getAST() = initList and result.getField() = field
+  result.getAst() = initList and result.getField() = field
 }
 
 TranslatedFieldInitialization getTranslatedConstructorFieldInitialization(ConstructorFieldInit init) {
-  result.getAST() = init
+  result.getAst() = init
 }
 
 /**
@@ -478,7 +481,10 @@ abstract class TranslatedFieldInitialization extends TranslatedElement {
 
   final override string toString() { result = ast.toString() + "." + field.toString() }
 
-  final override Locatable getAST() { result = ast }
+  final override Locatable getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = ast.getEnclosingFunction() }
 
@@ -622,7 +628,10 @@ abstract class TranslatedElementInitialization extends TranslatedElement {
     result = initList.toString() + "[" + getElementIndex().toString() + "]"
   }
 
-  final override Locatable getAST() { result = initList }
+  final override Locatable getAst() { result = initList }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = initList.getEnclosingFunction() }
 
@@ -802,7 +811,10 @@ class TranslatedElementValueInitialization extends TranslatedElementInitializati
 abstract class TranslatedStructorCallFromStructor extends TranslatedElement, StructorCallContext {
   FunctionCall call;
 
-  final override Locatable getAST() { result = call }
+  final override Locatable getAst() { result = call }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override TranslatedElement getChild(int id) {
     id = 0 and
@@ -864,7 +876,7 @@ abstract class TranslatedConstructorCallFromConstructor extends TranslatedStruct
 }
 
 TranslatedConstructorCallFromConstructor getTranslatedConstructorBaseInit(ConstructorBaseInit init) {
-  result.getAST() = init
+  result.getAst() = init
 }
 
 /**
@@ -904,7 +916,7 @@ class TranslatedConstructorBaseInit extends TranslatedConstructorCallFromConstru
 TranslatedDestructorBaseDestruction getTranslatedDestructorBaseDestruction(
   DestructorBaseDestruction destruction
 ) {
-  result.getAST() = destruction
+  result.getAst() = destruction
 }
 
 /**
@@ -928,7 +940,10 @@ class TranslatedConstructorBareInit extends TranslatedElement, TTranslatedConstr
 
   TranslatedConstructorBareInit() { this = TTranslatedConstructorBareInit(init) }
 
-  override Locatable getAST() { result = init }
+  override Locatable getAst() { result = init }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override string toString() { result = "construct base (no constructor)" }
 
@@ -948,5 +963,5 @@ class TranslatedConstructorBareInit extends TranslatedElement, TTranslatedConstr
 }
 
 TranslatedConstructorBareInit getTranslatedConstructorBareInit(ConstructorInit init) {
-  result.getAST() = init
+  result.getAst() = init
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
index 2bc3b5bc3ef..eb195286339 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -11,7 +11,7 @@ private import TranslatedExpr
 private import TranslatedFunction
 private import TranslatedInitialization
 
-TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAST() = stmt }
+TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAst() = stmt }
 
 abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
   Stmt stmt;
@@ -20,7 +20,10 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
 
   final override string toString() { result = stmt.toString() }
 
-  final override Locatable getAST() { result = stmt }
+  final override Locatable getAst() { result = stmt }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = stmt.getEnclosingFunction() }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/DominanceInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/DominanceInternal.qll
index cee8fa1543b..aaa4cc7bd53 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/DominanceInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/DominanceInternal.qll
@@ -1,7 +1,5 @@
 private import ReachableBlock as Reachability
 
-private module ReachabilityGraph = Reachability::Graph;
-
 module Graph {
   import Reachability::Graph
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
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 1c2cc493338..e5a908bbf9a 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
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
index 80e06a381a1..369f7c317f9 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
@@ -1,2 +1,2 @@
 private import semmle.code.cpp.ir.implementation.internal.TOperand
-import UnaliasedSSAOperands
+import UnaliasedSsaOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
index 72bb239c153..c7487872512 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
@@ -2,7 +2,7 @@ private import SSAConstructionInternal
 private import OldIR
 private import Alias
 private import SSAConstruction
-private import DebugSSA
+private import DebugSsa
 
 bindingset[offset]
 private string getKeySuffixForOffset(int offset) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
index 5686bb439eb..1c75529be00 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
@@ -1,2 +1,2 @@
 private import SSAConstruction as SSA
-import SSA::SSAConsistency
+import SSA::SsaConsistency
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
index 5092e921cb3..13ec2ca4ca4 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -112,7 +112,7 @@ private module Cached {
     exists(Alias::getResultMemoryLocation(oldInstruction))
     or
     // This result was already modeled by a previous iteration of SSA.
-    Alias::canReuseSSAForOldResult(oldInstruction)
+    Alias::canReuseSsaForOldResult(oldInstruction)
   }
 
   cached
@@ -182,7 +182,7 @@ private module Cached {
    * unreachable, this predicate will recurse through any degenerate `Phi` instructions to find the
    * true definition.
    */
-  private Instruction getNewDefinitionFromOldSSA(OldIR::MemoryOperand oldOperand, Overlap overlap) {
+  private Instruction getNewDefinitionFromOldSsa(OldIR::MemoryOperand oldOperand, Overlap overlap) {
     exists(Overlap originalOverlap |
       originalOverlap = oldOperand.getDefinitionOverlap() and
       (
@@ -191,7 +191,7 @@ private module Cached {
         or
         exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
           phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
-          result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
+          result = getNewDefinitionFromOldSsa(phiOperand, phiOperandOverlap) and
           overlap =
             combineOverlap(pragma[only_bind_out](phiOperandOverlap),
               pragma[only_bind_out](originalOverlap))
@@ -233,7 +233,7 @@ private module Cached {
     )
     or
     exists(OldIR::NonPhiMemoryOperand oldOperand |
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap) and
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap) and
       oldOperand.getUse() = instruction and
       tag = oldOperand.getOperandTag()
     )
@@ -307,13 +307,13 @@ private module Cached {
    * Gets the new definition instruction for the operand of `instr` that flows from the block
    * `newPredecessorBlock`, based on that operand's definition in the old IR.
    */
-  private Instruction getNewPhiOperandDefinitionFromOldSSA(
+  private Instruction getNewPhiOperandDefinitionFromOldSsa(
     Instruction instr, IRBlock newPredecessorBlock, Overlap overlap
   ) {
     exists(OldIR::PhiInstruction oldPhi, OldIR::PhiInputOperand oldOperand |
       oldPhi = getOldInstruction(instr) and
       oldOperand = oldPhi.getInputOperand(getOldBlock(newPredecessorBlock)) and
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap)
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap)
     )
   }
 
@@ -333,7 +333,7 @@ private module Cached {
       overlap = Alias::getOverlap(actualDefLocation, useLocation)
     )
     or
-    result = getNewPhiOperandDefinitionFromOldSSA(instr, newPredecessorBlock, overlap)
+    result = getNewPhiOperandDefinitionFromOldSsa(instr, newPredecessorBlock, overlap)
   }
 
   cached
@@ -412,17 +412,17 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instr) {
-    result = getOldInstruction(instr).getAST()
+  Language::AST getInstructionAst(Instruction instr) {
+    result = getOldInstruction(instr).getAst()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(blockStartInstr, _) and
-      result = blockStartInstr.getAST()
+      result = blockStartInstr.getAst()
     )
     or
     exists(RawIR::Instruction primaryInstr |
       instr = chiInstruction(primaryInstr) and
-      result = primaryInstr.getAST()
+      result = primaryInstr.getAst()
     )
     or
     exists(IRFunctionBase irFunc |
@@ -430,6 +430,12 @@ private module Cached {
     )
   }
 
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instr) {
+    result = getInstructionAst(instr)
+  }
+
   cached
   Language::LanguageType getInstructionResultType(Instruction instr) {
     result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -975,35 +981,41 @@ module DefUse {
   }
 }
 
-predicate canReuseSSAForMemoryResult(Instruction instruction) {
+predicate canReuseSsaForMemoryResult(Instruction instruction) {
   exists(OldInstruction oldInstruction |
     oldInstruction = getOldInstruction(instruction) and
     (
       // The previous iteration said it was reusable, so we should mark it as reusable as well.
-      Alias::canReuseSSAForOldResult(oldInstruction)
+      Alias::canReuseSsaForOldResult(oldInstruction)
       or
       // The current alias analysis says it is reusable.
-      Alias::getResultMemoryLocation(oldInstruction).canReuseSSA()
+      Alias::getResultMemoryLocation(oldInstruction).canReuseSsa()
     )
   )
   or
   exists(Alias::MemoryLocation defLocation |
     // This is a `Phi` for a reusable location, so the result of the `Phi` is reusable as well.
     instruction = phiInstruction(_, defLocation) and
-    defLocation.canReuseSSA()
+    defLocation.canReuseSsa()
   )
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
+deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
+
 /**
  * Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
  * `DebugSSA` module, which is then imported by PrintSSA.
  */
-module DebugSSA {
+module DebugSsa {
   import PhiInsertion
   import DefUse
 }
 
+/** DEPRECATED: Alias for DebugSsa */
+deprecated module DebugSSA = DebugSsa;
+
 import CachedForDebugging
 
 cached
@@ -1038,7 +1050,7 @@ private module CachedForDebugging {
 
   private OldIR::IRTempVariable getOldTempVariable(IRTempVariable var) {
     result.getEnclosingFunction() = var.getEnclosingFunction() and
-    result.getAST() = var.getAST() and
+    result.getAst() = var.getAst() and
     result.getTag() = var.getTag()
   }
 
@@ -1061,7 +1073,7 @@ private module CachedForDebugging {
   int maxValue() { result = 2147483647 }
 }
 
-module SSAConsistency {
+module SsaConsistency {
   /**
    * Holds if a `MemoryOperand` has more than one `MemoryLocation` assigned by alias analysis.
    */
@@ -1114,6 +1126,9 @@ module SSAConsistency {
   }
 }
 
+/** DEPRECATED: Alias for SsaConsistency */
+deprecated module SSAConsistency = SsaConsistency;
+
 /**
  * Provides the portion of the parameterized IR interface that is used to construct the SSA stages
  * of the IR. The raw stage of the IR does not expose these predicates.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
index 70d44e03267..8f64bff29f2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
@@ -3,7 +3,7 @@ import semmle.code.cpp.ir.implementation.raw.internal.reachability.ReachableBloc
 import semmle.code.cpp.ir.implementation.raw.internal.reachability.Dominance as Dominance
 import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as NewIR
 import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as RawStage
-import semmle.code.cpp.ir.implementation.internal.TInstruction::UnaliasedSSAInstructions as SSAInstructions
+import semmle.code.cpp.ir.implementation.internal.TInstruction::UnaliasedSsaInstructions as SSAInstructions
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import SimpleSSA as Alias
-import semmle.code.cpp.ir.implementation.internal.TOperand::UnaliasedSSAOperands as SSAOperands
+import semmle.code.cpp.ir.implementation.internal.TOperand::UnaliasedSsaOperands as SSAOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
index f3e02c9f6a8..ec2e6f5ef34 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
@@ -41,11 +41,14 @@ predicate isVariableModeled(Allocation var) {
  * subsequent iterations will recompute SSA for any variable that we assumed did not escape, but
  * actually would have escaped if we had used a sound escape analysis.
  */
-predicate canReuseSSAForVariable(IRAutomaticVariable var) {
+predicate canReuseSsaForVariable(IRAutomaticVariable var) {
   isVariableModeled(var) and
   not allocationEscapes(var)
 }
 
+/** DEPRECATED: Alias for canReuseSsaForVariable */
+deprecated predicate canReuseSSAForVariable = canReuseSsaForVariable/1;
+
 private newtype TMemoryLocation = MkMemoryLocation(Allocation var) { isVariableModeled(var) }
 
 private MemoryLocation getMemoryLocation(Allocation var) { result.getAllocation() = var }
@@ -69,10 +72,16 @@ class MemoryLocation extends TMemoryLocation {
 
   final string getUniqueId() { result = var.getUniqueId() }
 
-  final predicate canReuseSSA() { canReuseSSAForVariable(var) }
+  final predicate canReuseSsa() { canReuseSsaForVariable(var) }
+
+  /** DEPRECATED: Alias for canReuseSsa */
+  deprecated predicate canReuseSSA() { canReuseSsa() }
 }
 
-predicate canReuseSSAForOldResult(Instruction instr) { none() }
+predicate canReuseSsaForOldResult(Instruction instr) { none() }
+
+/** DEPRECATED: Alias for canReuseSsaForOldResult */
+deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
 
 /**
  * Represents a set of `MemoryLocation`s that cannot overlap with
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll
index cee8fa1543b..aaa4cc7bd53 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll
@@ -1,7 +1,5 @@
 private import ReachableBlock as Reachability
 
-private module ReachabilityGraph = Reachability::Graph;
-
 module Graph {
   import Reachability::Graph
 
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
index ed201a14587..e360fa7b2bb 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
@@ -23,8 +23,6 @@ private class Printf extends FormattingFunction, AliasFunction {
 
   override int getFormatParameterIndex() { result = 0 }
 
-  deprecated override predicate isWideCharDefault() { hasName(["wprintf", "wprintf_s"]) }
-
   override predicate isOutputGlobal() { any() }
 
   override predicate parameterNeverEscapes(int n) { n = 0 }
@@ -49,8 +47,6 @@ private class Fprintf extends FormattingFunction {
 
   override int getFormatParameterIndex() { result = 1 }
 
-  deprecated override predicate isWideCharDefault() { hasName("fwprintf") }
-
   override int getOutputParameterIndex(boolean isStream) { result = 0 and isStream = true }
 }
 
@@ -77,15 +73,6 @@ private class Sprintf extends FormattingFunction {
     not exists(getDefinition().getFile().getRelativePath())
   }
 
-  deprecated override predicate isWideCharDefault() {
-    getParameter(getFormatParameterIndex())
-        .getType()
-        .getUnspecifiedType()
-        .(PointerType)
-        .getBaseType()
-        .getSize() > 1
-  }
-
   override int getFormatParameterIndex() {
     hasName("g_strdup_printf") and result = 0
     or
@@ -133,15 +120,6 @@ private class SnprintfImpl extends Snprintf {
     else result = getFirstFormatArgumentIndex() - 1
   }
 
-  deprecated override predicate isWideCharDefault() {
-    getParameter(getFormatParameterIndex())
-        .getType()
-        .getUnspecifiedType()
-        .(PointerType)
-        .getBaseType()
-        .getSize() > 1
-  }
-
   override int getOutputParameterIndex(boolean isStream) { result = 0 and isStream = false }
 
   override int getFirstFormatArgumentIndex() {
@@ -182,15 +160,6 @@ private class StringCchPrintf extends FormattingFunction {
     if getName().matches("%Ex") then result = 5 else result = 2
   }
 
-  deprecated override predicate isWideCharDefault() {
-    getParameter(getFormatParameterIndex())
-        .getType()
-        .getUnspecifiedType()
-        .(PointerType)
-        .getBaseType()
-        .getSize() > 1
-  }
-
   override int getOutputParameterIndex(boolean isStream) { result = 0 and isStream = false }
 
   override int getSizeParameterIndex() { result = 1 }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
index 9630bb13e18..1202895cca2 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
@@ -52,14 +52,6 @@ abstract class FormattingFunction extends ArrayFunction, TaintFunction {
    */
   predicate isMicrosoft() { anyFileCompiledAsMicrosoft() }
 
-  /**
-   * Holds if the default meaning of `%s` is a `wchar_t *`, rather than
-   * a `char *` (either way, `%S` will have the opposite meaning).
-   *
-   * DEPRECATED: Use getDefaultCharType() instead.
-   */
-  deprecated predicate isWideCharDefault() { none() }
-
   /**
    * Gets the character type used in the format string for this function.
    */
@@ -116,13 +108,6 @@ abstract class FormattingFunction extends ArrayFunction, TaintFunction {
    */
   int getOutputParameterIndex(boolean isStream) { none() }
 
-  /**
-   * Gets the position at which the output parameter, if any, occurs.
-   *
-   * DEPRECATED: use `getOutputParameterIndex(boolean isStream)` instead.
-   */
-  deprecated int getOutputParameterIndex() { result = getOutputParameterIndex(_) }
-
   /**
    * Holds if this function outputs to a global stream such as standard output,
    * standard error or a system log. For example `printf`.
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
index d2d2fbd5b3c..02cd5cb7876 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
@@ -29,8 +29,8 @@ private import RangeAnalysisUtils
  * The SSA logic comes in two versions: the standard SSA and range-analysis RangeSSA.
  * This class provides the range-analysis SSA logic.
  */
-library class RangeSSA extends SSAHelper {
-  RangeSSA() { this = 1 }
+library class RangeSsa extends SsaHelper {
+  RangeSsa() { this = 1 }
 
   /**
    * Add a phi node on the out-edge of a guard.
@@ -40,6 +40,9 @@ library class RangeSSA extends SSAHelper {
   }
 }
 
+/** DEPRECATED: Alias for RangeSsa */
+deprecated class RangeSSA = RangeSsa;
+
 private predicate guard_defn(VariableAccess v, Expr guard, BasicBlock b, boolean branch) {
   guardCondition(guard, v, branch) and
   guardSuccessor(guard, branch, b)
@@ -67,22 +70,22 @@ private predicate guardSuccessor(Expr guard, boolean branch, BasicBlock succ) {
  * nodes.
  */
 class RangeSsaDefinition extends ControlFlowNodeBase {
-  RangeSsaDefinition() { exists(RangeSSA x | x.ssa_defn(_, this, _, _)) }
+  RangeSsaDefinition() { exists(RangeSsa x | x.ssa_defn(_, this, _, _)) }
 
   /**
    * Gets a variable corresponding to a SSA StackVariable defined by
    * this definition.
    */
-  StackVariable getAVariable() { exists(RangeSSA x | x.ssa_defn(result, this, _, _)) }
+  StackVariable getAVariable() { exists(RangeSsa x | x.ssa_defn(result, this, _, _)) }
 
   /**
    * A string representation of the SSA variable represented by the pair
    * `(this, v)`.
    */
-  string toString(StackVariable v) { exists(RangeSSA x | result = x.toString(this, v)) }
+  string toString(StackVariable v) { exists(RangeSsa x | result = x.toString(this, v)) }
 
   /** Gets a use of the SSA variable represented by the pair `(this, v)`. */
-  VariableAccess getAUse(StackVariable v) { exists(RangeSSA x | result = x.getAUse(this, v)) }
+  VariableAccess getAUse(StackVariable v) { exists(RangeSsa x | result = x.getAUse(this, v)) }
 
   /** Gets the control flow node for this definition. */
   ControlFlowNode getDefinition() { result = this }
@@ -91,7 +94,7 @@ class RangeSsaDefinition extends ControlFlowNodeBase {
   BasicBlock getBasicBlock() { result.contains(this.getDefinition()) }
 
   /** Whether this definition is a phi node for variable `v`. */
-  predicate isPhiNode(StackVariable v) { exists(RangeSSA x | x.phi_node(v, this)) }
+  predicate isPhiNode(StackVariable v) { exists(RangeSsa x | x.phi_node(v, this)) }
 
   /**
    * DEPRECATED: Use isGuardPhi/4 instead
@@ -172,6 +175,6 @@ class RangeSsaDefinition extends ControlFlowNodeBase {
    * Holds if this definition of the variable `v` reached the end of the basic block `b`.
    */
   predicate reachesEndOfBB(StackVariable v, BasicBlock b) {
-    exists(RangeSSA x | x.ssaDefinitionReachesEndOfBB(v, this, b))
+    exists(RangeSsa x | x.ssaDefinitionReachesEndOfBB(v, this, b))
   }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
index 0be94ed4e62..e4f562af582 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
@@ -705,24 +705,6 @@ private float getTruncatedUpperBounds(Expr expr) {
     result = exprMaxVal(expr)
 }
 
-/**
- * Holds if the expression might overflow negatively. This predicate
- * does not consider the possibility that the expression might overflow
- * due to a conversion.
- *
- * DEPRECATED: use `exprMightOverflowNegatively` instead.
- */
-deprecated predicate negative_overflow(Expr expr) { exprMightOverflowNegatively(expr) }
-
-/**
- * Holds if the expression might overflow positively. This predicate
- * does not consider the possibility that the expression might overflow
- * due to a conversion.
- *
- * DEPRECATED: use `exprMightOverflowPositively` instead.
- */
-deprecated predicate positive_overflow(Expr expr) { exprMightOverflowPositively(expr) }
-
 /** Only to be called by `getTruncatedLowerBounds`. */
 private float getLowerBoundsImpl(Expr expr) {
   (
diff --git a/cpp/ql/lib/semmle/code/cpp/security/Encryption.qll b/cpp/ql/lib/semmle/code/cpp/security/Encryption.qll
index 55ef606483c..120b154b787 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/Encryption.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/Encryption.qll
@@ -84,31 +84,3 @@ string getSecureAlgorithmRegex() {
       "(^|.*[A-Z]{2}|.*[^a-zA-Z0-9])(" + strictconcat(getASecureAlgorithmName().toLowerCase(), "|") +
       ")([^a-z0-9].*|$)"
 }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getAnInsecureAlgorithmName()`
- * instead.
- */
-deprecated string algorithmBlacklist() { result = getAnInsecureAlgorithmName() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use
- * `getAnInsecureHashAlgorithmName()` instead.
- */
-deprecated string hashAlgorithmBlacklist() { result = getAnInsecureHashAlgorithmName() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getInsecureAlgorithmRegex()` instead.
- */
-deprecated string algorithmBlacklistRegex() { result = getInsecureAlgorithmRegex() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getASecureAlgorithmName()`
- * instead.
- */
-deprecated string algorithmWhitelist() { result = getASecureAlgorithmName() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getSecureAlgorithmRegex()` instead.
- */
-deprecated string algorithmWhitelistRegex() { result = getSecureAlgorithmRegex() }
diff --git a/cpp/ql/lib/semmle/code/cpp/stmts/Block.qll b/cpp/ql/lib/semmle/code/cpp/stmts/Block.qll
index 5fe8798cebb..871709de119 100644
--- a/cpp/ql/lib/semmle/code/cpp/stmts/Block.qll
+++ b/cpp/ql/lib/semmle/code/cpp/stmts/Block.qll
@@ -126,9 +126,3 @@ class BlockStmt extends Stmt, @stmt_block {
 
   override predicate mayBeGloballyImpure() { this.getAStmt().mayBeGloballyImpure() }
 }
-
-/**
- * DEPRECATED: This is now called `BlockStmt` to avoid confusion with
- * `BasicBlock`.
- */
-deprecated class Block = BlockStmt;
diff --git a/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll b/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
index 5b157a54ce8..ef311e6fc45 100644
--- a/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
@@ -61,13 +61,6 @@ class Stmt extends StmtParent, @stmt {
 
   override Location getLocation() { stmts(underlyingElement(this), _, result) }
 
-  /**
-   * Gets an int indicating the type of statement that this represents.
-   *
-   * DEPRECATED: use the subclasses of `Stmt` rather than relying on this predicate.
-   */
-  deprecated int getKind() { stmts(underlyingElement(this), result, _) }
-
   override string toString() { none() }
 
   override Function getControlFlowScope() { result = this.getEnclosingFunction() }
@@ -1230,38 +1223,6 @@ class SwitchCase extends Stmt, @stmt_switch_case {
    */
   int getChildNum() { switch_case(_, result, underlyingElement(this)) }
 
-  /**
-   * DEPRECATED: use `SwitchCase.getAStmt` or `ControlFlowNode.getASuccessor`
-   * rather than this predicate.
-   *
-   * Gets the `BlockStmt` statement immediately following this 'switch case'
-   * statement, if any.
-   *
-   * For example, for
-   * ```
-   * switch (i) {
-   * case 5:
-   *     x = 1;
-   *     break;
-   * case 6:
-   * case 7:
-   *     { x = 2; break; }
-   * default:
-   *     { x = 3; }
-   *     x = 4;
-   *     break;
-   * }
-   * ```
-   * the `case 7:` has result `{ x = 2; break; }`, `default:` has result
-   * `{ x = 3; }`, and the others have no result.
-   */
-  deprecated BlockStmt getLabelledStmt() {
-    exists(int i, Stmt parent |
-      this = parent.getChild(i) and
-      result = parent.getChild(i + 1)
-    )
-  }
-
   /**
    * Gets the next `SwitchCase` belonging to the same 'switch'
    * statement, if any.
@@ -1741,23 +1702,6 @@ class Handler extends Stmt, @stmt_handler {
   override predicate mayBeGloballyImpure() { none() }
 }
 
-/**
- * DEPRECATED: Objective-C is no longer supported.
- * The end of a 'finally' clause.
- *
- * This has no concrete representation in the source, but makes the
- * control flow graph easier to use.
- */
-deprecated class FinallyEnd extends Stmt {
-  FinallyEnd() { none() }
-
-  override string toString() { result = "<finally end>" }
-
-  override predicate mayBeImpure() { none() }
-
-  override predicate mayBeGloballyImpure() { none() }
-}
-
 /**
  * A C/C++ 'try' statement.
  *
diff --git a/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll b/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll
index f9231e24725..d5e69d31254 100644
--- a/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll
@@ -89,7 +89,7 @@ private ControlFlowNode getControlFlowEntry(ControlFlowNode node) {
  * graph so that we can use the dominator tree to find the most recent
  * side-effect.
  */
-private predicate sideEffectCFG(ControlFlowNode src, ControlFlowNode dst) {
+private predicate sideEffectCfg(ControlFlowNode src, ControlFlowNode dst) {
   src.getASuccessor() = dst
   or
   // Add an edge from the entry point to any node that might have a side
@@ -103,7 +103,7 @@ private predicate sideEffectCFG(ControlFlowNode src, ControlFlowNode dst) {
  * the side-effect CFG.
  */
 private predicate iDomEffect(ControlFlowNode dominator, ControlFlowNode node) =
-  idominance(functionEntry/1, sideEffectCFG/2)(_, dominator, node)
+  idominance(functionEntry/1, sideEffectCfg/2)(_, dominator, node)
 
 /**
  * Gets the most recent side effect. To be more precise, `result` is a
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index bb0f279f2ac..e9a518baf14 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -703,7 +703,7 @@ usertype_final(unique int id: @usertype ref);
 
 usertype_uuid(
     unique int id: @usertype ref,
-    unique string uuid: string ref
+    string uuid: string ref
 );
 
 mangled_name(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 07abcbbef90..472bfd55aaf 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -1,39132 +1,39549 @@
 <dbstats>
-  <typesizes><e>
-<k>@compilation</k>
-<v>9440</v>
-</e>
-<e>
-<k>@externalDataElement</k>
-<v>65</v>
-</e>
-<e>
-<k>@external_package</k>
-<v>119</v>
-</e>
-<e>
-<k>@svnentry</k>
-<v>575525</v>
-</e>
-<e>
-<k>@location_default</k>
-<v>8719593</v>
-</e>
-<e>
-<k>@location_stmt</k>
-<v>2179578</v>
-</e>
-<e>
-<k>@location_expr</k>
-<v>9756708</v>
-</e>
-<e>
-<k>@diagnostic</k>
-<v>67893</v>
-</e>
-<e>
-<k>@file</k>
-<v>59320</v>
-</e>
-<e>
-<k>@folder</k>
-<v>10817</v>
-</e>
-<e>
-<k>@macroinvocation</k>
-<v>34675701</v>
-</e>
-<e>
-<k>@function</k>
-<v>3658482</v>
-</e>
-<e>
-<k>@fun_decl</k>
-<v>3730234</v>
-</e>
-<e>
-<k>@var_decl</k>
-<v>5296821</v>
-</e>
-<e>
-<k>@type_decl</k>
-<v>1316547</v>
-</e>
-<e>
-<k>@namespace_decl</k>
-<v>135267</v>
-</e>
-<e>
-<k>@using</k>
-<v>287692</v>
-</e>
-<e>
-<k>@static_assert</k>
-<v>130452</v>
-</e>
-<e>
-<k>@parameter</k>
-<v>4572935</v>
-</e>
-<e>
-<k>@membervariable</k>
-<v>302107</v>
-</e>
-<e>
-<k>@globalvariable</k>
-<v>301143</v>
-</e>
-<e>
-<k>@localvariable</k>
-<v>520392</v>
-</e>
-<e>
-<k>@enumconstant</k>
-<v>93691</v>
-</e>
-<e>
-<k>@builtintype</k>
-<v>509</v>
-</e>
-<e>
-<k>@derivedtype</k>
-<v>4408457</v>
-</e>
-<e>
-<k>@decltype</k>
-<v>46454</v>
-</e>
-<e>
-<k>@usertype</k>
-<v>4144306</v>
-</e>
-<e>
-<k>@mangledname</k>
-<v>478020</v>
-</e>
-<e>
-<k>@type_mention</k>
-<v>1674881</v>
-</e>
-<e>
-<k>@routinetype</k>
-<v>421539</v>
-</e>
-<e>
-<k>@ptrtomember</k>
-<v>12486</v>
-</e>
-<e>
-<k>@specifier</k>
-<v>498</v>
-</e>
-<e>
-<k>@gnuattribute</k>
-<v>414234</v>
-</e>
-<e>
-<k>@stdattribute</k>
-<v>363</v>
-</e>
-<e>
-<k>@declspec</k>
-<v>57736</v>
-</e>
-<e>
-<k>@msattribute</k>
-<v>3</v>
-</e>
-<e>
-<k>@alignas</k>
-<v>1723</v>
-</e>
-<e>
-<k>@attribute_arg_empty</k>
-<v>1</v>
-</e>
-<e>
-<k>@attribute_arg_token</k>
-<v>15700</v>
-</e>
-<e>
-<k>@attribute_arg_constant</k>
-<v>146454</v>
-</e>
-<e>
-<k>@attribute_arg_type</k>
-<v>54</v>
-</e>
-<e>
-<k>@derivation</k>
-<v>385706</v>
-</e>
-<e>
-<k>@frienddecl</k>
-<v>237444</v>
-</e>
-<e>
-<k>@comment</k>
-<v>1561817</v>
-</e>
-<e>
-<k>@namespace</k>
-<v>7597</v>
-</e>
-<e>
-<k>@specialnamequalifyingelement</k>
-<v>10</v>
-</e>
-<e>
-<k>@namequalifier</k>
-<v>1119060</v>
-</e>
-<e>
-<k>@value</k>
-<v>8774622</v>
-</e>
-<e>
-<k>@initialiser</k>
-<v>1662175</v>
-</e>
-<e>
-<k>@errorexpr</k>
-<v>48145</v>
-</e>
-<e>
-<k>@address_of</k>
-<v>440386</v>
-</e>
-<e>
-<k>@reference_to</k>
-<v>1045861</v>
-</e>
-<e>
-<k>@indirect</k>
-<v>294699</v>
-</e>
-<e>
-<k>@ref_indirect</k>
-<v>1239321</v>
-</e>
-<e>
-<k>@array_to_pointer</k>
-<v>997247</v>
-</e>
-<e>
-<k>@vacuous_destructor_call</k>
-<v>5061</v>
-</e>
-<e>
-<k>@assume</k>
-<v>3280</v>
-</e>
-<e>
-<k>@parexpr</k>
-<v>3000807</v>
-</e>
-<e>
-<k>@arithnegexpr</k>
-<v>652982</v>
-</e>
-<e>
-<k>@unaryplusexpr</k>
-<v>184</v>
-</e>
-<e>
-<k>@complementexpr</k>
-<v>28032</v>
-</e>
-<e>
-<k>@notexpr</k>
-<v>338408</v>
-</e>
-<e>
-<k>@conjugation</k>
-<v>1</v>
-</e>
-<e>
-<k>@realpartexpr</k>
-<v>65</v>
-</e>
-<e>
-<k>@imagpartexpr</k>
-<v>65</v>
-</e>
-<e>
-<k>@postincrexpr</k>
-<v>43048</v>
-</e>
-<e>
-<k>@postdecrexpr</k>
-<v>5402</v>
-</e>
-<e>
-<k>@preincrexpr</k>
-<v>61791</v>
-</e>
-<e>
-<k>@predecrexpr</k>
-<v>24506</v>
-</e>
-<e>
-<k>@conditionalexpr</k>
-<v>154485</v>
-</e>
-<e>
-<k>@addexpr</k>
-<v>246779</v>
-</e>
-<e>
-<k>@subexpr</k>
-<v>135008</v>
-</e>
-<e>
-<k>@mulexpr</k>
-<v>140641</v>
-</e>
-<e>
-<k>@divexpr</k>
-<v>63732</v>
-</e>
-<e>
-<k>@remexpr</k>
-<v>4539</v>
-</e>
-<e>
-<k>@jmulexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@jdivexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@fjaddexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@jfaddexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@fjsubexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@jfsubexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@paddexpr</k>
-<v>87270</v>
-</e>
-<e>
-<k>@psubexpr</k>
-<v>21970</v>
-</e>
-<e>
-<k>@pdiffexpr</k>
-<v>24788</v>
-</e>
-<e>
-<k>@lshiftexpr</k>
-<v>350576</v>
-</e>
-<e>
-<k>@rshiftexpr</k>
-<v>71789</v>
-</e>
-<e>
-<k>@andexpr</k>
-<v>257998</v>
-</e>
-<e>
-<k>@orexpr</k>
-<v>143145</v>
-</e>
-<e>
-<k>@xorexpr</k>
-<v>37313</v>
-</e>
-<e>
-<k>@eqexpr</k>
-<v>212665</v>
-</e>
-<e>
-<k>@neexpr</k>
-<v>88475</v>
-</e>
-<e>
-<k>@gtexpr</k>
-<v>43945</v>
-</e>
-<e>
-<k>@ltexpr</k>
-<v>51329</v>
-</e>
-<e>
-<k>@geexpr</k>
-<v>22366</v>
-</e>
-<e>
-<k>@leexpr</k>
-<v>213944</v>
-</e>
-<e>
-<k>@minexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@maxexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@assignexpr</k>
-<v>551753</v>
-</e>
-<e>
-<k>@assignaddexpr</k>
-<v>68313</v>
-</e>
-<e>
-<k>@assignsubexpr</k>
-<v>7863</v>
-</e>
-<e>
-<k>@assignmulexpr</k>
-<v>6828</v>
-</e>
-<e>
-<k>@assigndivexpr</k>
-<v>2048</v>
-</e>
-<e>
-<k>@assignremexpr</k>
-<v>270</v>
-</e>
-<e>
-<k>@assignlshiftexpr</k>
-<v>598</v>
-</e>
-<e>
-<k>@assignrshiftexpr</k>
-<v>4513</v>
-</e>
-<e>
-<k>@assignandexpr</k>
-<v>7190</v>
-</e>
-<e>
-<k>@assignorexpr</k>
-<v>17576</v>
-</e>
-<e>
-<k>@assignxorexpr</k>
-<v>21997</v>
-</e>
-<e>
-<k>@assignpaddexpr</k>
-<v>13024</v>
-</e>
-<e>
-<k>@assignpsubexpr</k>
-<v>577</v>
-</e>
-<e>
-<k>@andlogicalexpr</k>
-<v>130955</v>
-</e>
-<e>
-<k>@orlogicalexpr</k>
-<v>74652</v>
-</e>
-<e>
-<k>@commaexpr</k>
-<v>10611</v>
-</e>
-<e>
-<k>@subscriptexpr</k>
-<v>166218</v>
-</e>
-<e>
-<k>@virtfunptrexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@callexpr</k>
-<v>224123</v>
-</e>
-<e>
-<k>@vastartexpr</k>
-<v>3657</v>
-</e>
-<e>
-<k>@vaargexpr</k>
-<v>975</v>
-</e>
-<e>
-<k>@vaendexpr</k>
-<v>491</v>
-</e>
-<e>
-<k>@vacopyexpr</k>
-<v>30</v>
-</e>
-<e>
-<k>@varaccess</k>
-<v>5309798</v>
-</e>
-<e>
-<k>@thisaccess</k>
-<v>1165266</v>
-</e>
-<e>
-<k>@new_expr</k>
-<v>31757</v>
-</e>
-<e>
-<k>@delete_expr</k>
-<v>5896</v>
-</e>
-<e>
-<k>@throw_expr</k>
-<v>22056</v>
-</e>
-<e>
-<k>@condition_decl</k>
-<v>6947</v>
-</e>
-<e>
-<k>@braced_init_list</k>
-<v>119</v>
-</e>
-<e>
-<k>@type_id</k>
-<v>4368</v>
-</e>
-<e>
-<k>@runtime_sizeof</k>
-<v>279225</v>
-</e>
-<e>
-<k>@runtime_alignof</k>
-<v>1561</v>
-</e>
-<e>
-<k>@sizeof_pack</k>
-<v>466</v>
-</e>
-<e>
-<k>@expr_stmt</k>
-<v>156574</v>
-</e>
-<e>
-<k>@routineexpr</k>
-<v>2239747</v>
-</e>
-<e>
-<k>@type_operand</k>
-<v>123457</v>
-</e>
-<e>
-<k>@offsetofexpr</k>
-<v>33641</v>
-</e>
-<e>
-<k>@hasassignexpr</k>
-<v>2</v>
-</e>
-<e>
-<k>@hascopyexpr</k>
-<v>2</v>
-</e>
-<e>
-<k>@hasnothrowassign</k>
-<v>3</v>
-</e>
-<e>
-<k>@hasnothrowconstr</k>
-<v>3</v>
-</e>
-<e>
-<k>@hasnothrowcopy</k>
-<v>5</v>
-</e>
-<e>
-<k>@hastrivialassign</k>
-<v>2</v>
-</e>
-<e>
-<k>@hastrivialconstr</k>
-<v>3</v>
-</e>
-<e>
-<k>@hastrivialcopy</k>
-<v>2</v>
-</e>
-<e>
-<k>@hasuserdestr</k>
-<v>3</v>
-</e>
-<e>
-<k>@hasvirtualdestr</k>
-<v>3</v>
-</e>
-<e>
-<k>@isabstractexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@isbaseofexpr</k>
-<v>38</v>
-</e>
-<e>
-<k>@isclassexpr</k>
-<v>214</v>
-</e>
-<e>
-<k>@isconvtoexpr</k>
-<v>12</v>
-</e>
-<e>
-<k>@isemptyexpr</k>
-<v>162</v>
-</e>
-<e>
-<k>@isenumexpr</k>
-<v>21</v>
-</e>
-<e>
-<k>@ispodexpr</k>
-<v>596</v>
-</e>
-<e>
-<k>@ispolyexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@isunionexpr</k>
-<v>5</v>
-</e>
-<e>
-<k>@typescompexpr</k>
-<v>44908</v>
-</e>
-<e>
-<k>@intaddrexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@hastrivialdestructor</k>
-<v>108</v>
-</e>
-<e>
-<k>@literal</k>
-<v>4380637</v>
-</e>
-<e>
-<k>@uuidof</k>
-<v>844</v>
-</e>
-<e>
-<k>@aggregateliteral</k>
-<v>915561</v>
-</e>
-<e>
-<k>@delete_array_expr</k>
-<v>1333</v>
-</e>
-<e>
-<k>@new_array_expr</k>
-<v>5287</v>
-</e>
-<e>
-<k>@foldexpr</k>
-<v>4</v>
-</e>
-<e>
-<k>@ctordirectinit</k>
-<v>89137</v>
-</e>
-<e>
-<k>@ctorvirtualinit</k>
-<v>6156</v>
-</e>
-<e>
-<k>@ctorfieldinit</k>
-<v>193753</v>
-</e>
-<e>
-<k>@ctordelegatinginit</k>
-<v>726</v>
-</e>
-<e>
-<k>@dtordirectdestruct</k>
-<v>28798</v>
-</e>
-<e>
-<k>@dtorvirtualdestruct</k>
-<v>2406</v>
-</e>
-<e>
-<k>@dtorfielddestruct</k>
-<v>29557</v>
-</e>
-<e>
-<k>@static_cast</k>
-<v>212243</v>
-</e>
-<e>
-<k>@reinterpret_cast</k>
-<v>30758</v>
-</e>
-<e>
-<k>@const_cast</k>
-<v>5245</v>
-</e>
-<e>
-<k>@dynamic_cast</k>
-<v>975</v>
-</e>
-<e>
-<k>@c_style_cast</k>
-<v>4235362</v>
-</e>
-<e>
-<k>@lambdaexpr</k>
-<v>12660</v>
-</e>
-<e>
-<k>@param_ref</k>
-<v>84888</v>
-</e>
-<e>
-<k>@noopexpr</k>
-<v>38</v>
-</e>
-<e>
-<k>@istriviallyconstructibleexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@isdestructibleexpr</k>
-<v>4</v>
-</e>
-<e>
-<k>@isnothrowdestructibleexpr</k>
-<v>5</v>
-</e>
-<e>
-<k>@istriviallydestructibleexpr</k>
-<v>5</v>
-</e>
-<e>
-<k>@istriviallyassignableexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@isnothrowassignableexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@istrivialexpr</k>
-<v>43</v>
-</e>
-<e>
-<k>@isstandardlayoutexpr</k>
-<v>2</v>
-</e>
-<e>
-<k>@istriviallycopyableexpr</k>
-<v>2330</v>
-</e>
-<e>
-<k>@isliteraltypeexpr</k>
-<v>2</v>
-</e>
-<e>
-<k>@hastrivialmoveconstructorexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@hastrivialmoveassignexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@hasnothrowmoveassignexpr</k>
-<v>4</v>
-</e>
-<e>
-<k>@isconstructibleexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@isnothrowconstructibleexpr</k>
-<v>3</v>
-</e>
-<e>
-<k>@hasfinalizerexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@isdelegateexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@isinterfaceclassexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@isrefarrayexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@isrefclassexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@issealedexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@issimplevalueclassexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@isvalueclassexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@isfinalexpr</k>
-<v>162</v>
-</e>
-<e>
-<k>@noexceptexpr</k>
-<v>17320</v>
-</e>
-<e>
-<k>@builtinshufflevector</k>
-<v>1</v>
-</e>
-<e>
-<k>@builtinchooseexpr</k>
-<v>7405</v>
-</e>
-<e>
-<k>@builtinaddressof</k>
-<v>3923</v>
-</e>
-<e>
-<k>@vec_fill</k>
-<v>1</v>
-</e>
-<e>
-<k>@builtinconvertvector</k>
-<v>1</v>
-</e>
-<e>
-<k>@builtincomplex</k>
-<v>4</v>
-</e>
-<e>
-<k>@spaceshipexpr</k>
-<v>1</v>
-</e>
-<e>
-<k>@co_await</k>
-<v>6</v>
-</e>
-<e>
-<k>@co_yield</k>
-<v>1</v>
-</e>
-<e>
-<k>@temp_init</k>
-<v>241259</v>
-</e>
-<e>
-<k>@lambdacapture</k>
-<v>21618</v>
-</e>
-<e>
-<k>@stmt_expr</k>
-<v>1267720</v>
-</e>
-<e>
-<k>@stmt_if</k>
-<v>524673</v>
-</e>
-<e>
-<k>@stmt_while</k>
-<v>30641</v>
-</e>
-<e>
-<k>@stmt_goto</k>
-<v>111468</v>
-</e>
-<e>
-<k>@stmt_label</k>
-<v>81577</v>
-</e>
-<e>
-<k>@stmt_return</k>
-<v>1116898</v>
-</e>
-<e>
-<k>@stmt_block</k>
-<v>1309643</v>
-</e>
-<e>
-<k>@stmt_end_test_while</k>
-<v>149931</v>
-</e>
-<e>
-<k>@stmt_for</k>
-<v>32103</v>
-</e>
-<e>
-<k>@stmt_switch_case</k>
-<v>271721</v>
-</e>
-<e>
-<k>@stmt_switch</k>
-<v>53308</v>
-</e>
-<e>
-<k>@stmt_asm</k>
-<v>241548</v>
-</e>
-<e>
-<k>@stmt_try_block</k>
-<v>17753</v>
-</e>
-<e>
-<k>@stmt_microsoft_try</k>
-<v>168</v>
-</e>
-<e>
-<k>@stmt_decl</k>
-<v>605017</v>
-</e>
-<e>
-<k>@stmt_set_vla_size</k>
-<v>11</v>
-</e>
-<e>
-<k>@stmt_vla_decl</k>
-<v>8</v>
-</e>
-<e>
-<k>@stmt_assigned_goto</k>
-<v>9139</v>
-</e>
-<e>
-<k>@stmt_empty</k>
-<v>102194</v>
-</e>
-<e>
-<k>@stmt_continue</k>
-<v>8080</v>
-</e>
-<e>
-<k>@stmt_break</k>
-<v>224116</v>
-</e>
-<e>
-<k>@stmt_range_based_for</k>
-<v>21</v>
-</e>
-<e>
-<k>@stmt_handler</k>
-<v>21612</v>
-</e>
-<e>
-<k>@stmt_constexpr_if</k>
-<v>3</v>
-</e>
-<e>
-<k>@stmt_co_return</k>
-<v>2</v>
-</e>
-<e>
-<k>@ppd_if</k>
-<v>154267</v>
-</e>
-<e>
-<k>@ppd_ifdef</k>
-<v>60371</v>
-</e>
-<e>
-<k>@ppd_ifndef</k>
-<v>82352</v>
-</e>
-<e>
-<k>@ppd_elif</k>
-<v>20387</v>
-</e>
-<e>
-<k>@ppd_else</k>
-<v>56990</v>
-</e>
-<e>
-<k>@ppd_endif</k>
-<v>296991</v>
-</e>
-<e>
-<k>@ppd_plain_include</k>
-<v>287356</v>
-</e>
-<e>
-<k>@ppd_define</k>
-<v>314344</v>
-</e>
-<e>
-<k>@ppd_undef</k>
-<v>19021</v>
-</e>
-<e>
-<k>@ppd_line</k>
-<v>12495</v>
-</e>
-<e>
-<k>@ppd_error</k>
-<v>43</v>
-</e>
-<e>
-<k>@ppd_pragma</k>
-<v>36507</v>
-</e>
-<e>
-<k>@ppd_objc_import</k>
-<v>2</v>
-</e>
-<e>
-<k>@ppd_include_next</k>
-<v>86</v>
-</e>
-<e>
-<k>@ppd_warning</k>
-<v>1</v>
-</e>
-<e>
-<k>@link_target</k>
-<v>574</v>
-</e>
-<e>
-<k>@xmldtd</k>
-<v>1</v>
-</e>
-<e>
-<k>@xmlelement</k>
-<v>1270313</v>
-</e>
-<e>
-<k>@xmlattribute</k>
-<v>1202020</v>
-</e>
-<e>
-<k>@xmlnamespace</k>
-<v>4185</v>
-</e>
-<e>
-<k>@xmlcomment</k>
-<v>26812</v>
-</e>
-<e>
-<k>@xmlcharacters</k>
-<v>439958</v>
-</e>
-</typesizes>
-  <stats><relation>
-<name>compilations</name>
-<cardinality>9440</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>9440</v>
-</e>
-<e>
-<k>cwd</k>
-<v>10</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>cwd</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9440</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>cwd</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>871</a>
-<b>872</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>compilation_args</name>
-<cardinality>376128</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4323</v>
-</e>
-<e>
-<k>num</k>
-<v>162</v>
-</e>
-<e>
-<k>arg</k>
-<v>18625</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>13</a>
-<b>77</b>
-<v>324</v>
-</b>
-<b>
-<a>85</a>
-<b>86</b>
-<v>9</v>
-</b>
-<b>
-<a>89</a>
-<b>90</b>
-<v>3202</v>
-</b>
-<b>
-<a>90</a>
-<b>92</b>
-<v>221</v>
-</b>
-<b>
-<a>92</a>
-<b>96</b>
-<v>267</v>
-</b>
-<b>
-<a>99</a>
-<b>101</b>
-<v>298</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>arg</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>13</a>
-<b>77</b>
-<v>324</v>
-</b>
-<b>
-<a>82</a>
-<b>83</b>
-<v>9</v>
-</b>
-<b>
-<a>88</a>
-<b>89</b>
-<v>3204</v>
-</b>
-<b>
-<a>89</a>
-<b>90</b>
-<v>158</v>
-</b>
-<b>
-<a>90</a>
-<b>92</b>
-<v>327</v>
-</b>
-<b>
-<a>94</a>
-<b>97</b>
-<v>299</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>185</b>
-<v>13</v>
-</b>
-<b>
-<a>347</a>
-<b>2449</b>
-<v>11</v>
-</b>
-<b>
-<a>2454</a>
-<b>2455</b>
-<v>14</v>
-</b>
-<b>
-<a>2456</a>
-<b>2530</b>
-<v>13</v>
-</b>
-<b>
-<a>2530</a>
-<b>2534</b>
-<v>13</v>
-</b>
-<b>
-<a>2534</a>
-<b>2539</b>
-<v>13</v>
-</b>
-<b>
-<a>2539</a>
-<b>2544</b>
-<v>13</v>
-</b>
-<b>
-<a>2550</a>
-<b>2595</b>
-<v>9</v>
-</b>
-<b>
-<a>2604</a>
-<b>2607</b>
-<v>13</v>
-</b>
-<b>
-<a>2607</a>
-<b>2618</b>
-<v>13</v>
-</b>
-<b>
-<a>2619</a>
-<b>2643</b>
-<v>13</v>
-</b>
-<b>
-<a>2648</a>
-<b>2649</b>
-<v>1</v>
-</b>
-<b>
-<a>2653</a>
-<b>2654</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>arg</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>4</b>
-<v>11</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>14</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>19</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>14</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>16</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>9</v>
-</b>
-<b>
-<a>11</a>
-<b>13</b>
-<v>8</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>9</v>
-</b>
-<b>
-<a>14</a>
-<b>18</b>
-<v>13</v>
-</b>
-<b>
-<a>18</a>
-<b>26</b>
-<v>13</v>
-</b>
-<b>
-<a>30</a>
-<b>90</b>
-<v>13</v>
-</b>
-<b>
-<a>140</a>
-<b>1349</b>
-<v>13</v>
-</b>
-<b>
-<a>1739</a>
-<b>2534</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>17722</v>
-</b>
-<b>
-<a>2</a>
-<b>2654</b>
-<v>902</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18286</v>
-</b>
-<b>
-<a>2</a>
-<b>55</b>
-<v>339</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>compilation_compiling_files</name>
-<cardinality>9440</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>9440</v>
-</e>
-<e>
-<k>num</k>
-<v>10</v>
-</e>
-<e>
-<k>file</k>
-<v>4790</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9440</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9440</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>871</a>
-<b>872</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>442</a>
-<b>443</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>270</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4498</v>
-</b>
-<b>
-<a>3</a>
-<b>14</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4790</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>compilation_time</name>
-<cardinality>37675</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>9418</v>
-</e>
-<e>
-<k>num</k>
-<v>10</v>
-</e>
-<e>
-<k>kind</k>
-<v>43</v>
-</e>
-<e>
-<k>seconds</k>
-<v>11868</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9418</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9418</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2850</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>869</a>
-<b>870</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1095</a>
-<b>1096</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>869</a>
-<b>870</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>579</a>
-<b>580</b>
-<v>10</v>
-</b>
-<b>
-<a>647</a>
-<b>648</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>seconds</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8053</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2254</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>997</v>
-</b>
-<b>
-<a>5</a>
-<b>632</b>
-<v>563</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>seconds</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11868</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>seconds</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10253</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1604</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>diagnostic_for</name>
-<cardinality>837183</cardinality>
-<columnsizes>
-<e>
-<k>diagnostic</k>
-<v>67893</v>
-</e>
-<e>
-<k>compilation</k>
-<v>9115</v>
-</e>
-<e>
-<k>file_number</k>
-<v>10</v>
-</e>
-<e>
-<k>file_number_diagnostic_number</k>
-<v>6427</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>diagnostic</src>
-<trg>compilation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9147</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>56079</v>
-</b>
-<b>
-<a>254</a>
-<b>840</b>
-<v>2666</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>diagnostic</src>
-<trg>file_number</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>diagnostic</src>
-<trg>file_number_diagnostic_number</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>compilation</src>
-<trg>diagnostic</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>5744</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>596</v>
-</b>
-<b>
-<a>247</a>
-<b>248</b>
-<v>1842</v>
-</b>
-<b>
-<a>263</a>
-<b>444</b>
-<v>715</v>
-</b>
-<b>
-<a>446</a>
-<b>594</b>
-<v>195</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>compilation</src>
-<trg>file_number</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9115</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>compilation</src>
-<trg>file_number_diagnostic_number</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>5744</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>596</v>
-</b>
-<b>
-<a>247</a>
-<b>248</b>
-<v>1842</v>
-</b>
-<b>
-<a>263</a>
-<b>444</b>
-<v>715</v>
-</b>
-<b>
-<a>446</a>
-<b>594</b>
-<v>195</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file_number</src>
-<trg>diagnostic</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6264</a>
-<b>6265</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file_number</src>
-<trg>compilation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>841</a>
-<b>842</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file_number</src>
-<trg>file_number_diagnostic_number</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>593</a>
-<b>594</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file_number_diagnostic_number</src>
-<trg>diagnostic</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2644</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>574</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>942</v>
-</b>
-<b>
-<a>7</a>
-<b>14</b>
-<v>509</v>
-</b>
-<b>
-<a>15</a>
-<b>16</b>
-<v>54</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>563</v>
-</b>
-<b>
-<a>18</a>
-<b>23</b>
-<v>433</v>
-</b>
-<b>
-<a>26</a>
-<b>40</b>
-<v>520</v>
-</b>
-<b>
-<a>42</a>
-<b>842</b>
-<v>184</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file_number_diagnostic_number</src>
-<trg>compilation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>9</b>
-<v>552</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>942</v>
-</b>
-<b>
-<a>14</a>
-<b>27</b>
-<v>509</v>
-</b>
-<b>
-<a>30</a>
-<b>31</b>
-<v>54</v>
-</b>
-<b>
-<a>34</a>
-<b>35</b>
-<v>563</v>
-</b>
-<b>
-<a>36</a>
-<b>45</b>
-<v>433</v>
-</b>
-<b>
-<a>52</a>
-<b>79</b>
-<v>520</v>
-</b>
-<b>
-<a>84</a>
-<b>85</b>
-<v>173</v>
-</b>
-<b>
-<a>254</a>
-<b>255</b>
-<v>2590</v>
-</b>
-<b>
-<a>309</a>
-<b>842</b>
-<v>86</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file_number_diagnostic_number</src>
-<trg>file_number</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6427</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>compilation_finished</name>
-<cardinality>9440</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>9440</v>
-</e>
-<e>
-<k>cpu_seconds</k>
-<v>7619</v>
-</e>
-<e>
-<k>elapsed_seconds</k>
-<v>195</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>cpu_seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9440</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>elapsed_seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9440</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>cpu_seconds</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6449</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>856</v>
-</b>
-<b>
-<a>3</a>
-<b>11</b>
-<v>314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>cpu_seconds</src>
-<trg>elapsed_seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7045</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>574</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elapsed_seconds</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>54</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>21</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>10</v>
-</b>
-<b>
-<a>26</a>
-<b>27</b>
-<v>10</v>
-</b>
-<b>
-<a>34</a>
-<b>35</b>
-<v>10</v>
-</b>
-<b>
-<a>124</a>
-<b>125</b>
-<v>10</v>
-</b>
-<b>
-<a>125</a>
-<b>126</b>
-<v>10</v>
-</b>
-<b>
-<a>140</a>
-<b>141</b>
-<v>10</v>
-</b>
-<b>
-<a>174</a>
-<b>175</b>
-<v>10</v>
-</b>
-<b>
-<a>199</a>
-<b>200</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elapsed_seconds</src>
-<trg>cpu_seconds</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>54</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>21</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>10</v>
-</b>
-<b>
-<a>26</a>
-<b>27</b>
-<v>10</v>
-</b>
-<b>
-<a>34</a>
-<b>35</b>
-<v>10</v>
-</b>
-<b>
-<a>95</a>
-<b>96</b>
-<v>10</v>
-</b>
-<b>
-<a>106</a>
-<b>107</b>
-<v>10</v>
-</b>
-<b>
-<a>118</a>
-<b>119</b>
-<v>10</v>
-</b>
-<b>
-<a>148</a>
-<b>149</b>
-<v>10</v>
-</b>
-<b>
-<a>180</a>
-<b>181</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>externalData</name>
-<cardinality>130</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>65</v>
-</e>
-<e>
-<k>path</k>
-<v>10</v>
-</e>
-<e>
-<k>column</k>
-<v>21</v>
-</e>
-<e>
-<k>value</k>
-<v>130</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>path</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>column</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>path</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>path</src>
-<trg>column</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>path</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>column</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>column</src>
-<trg>path</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>column</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>path</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>column</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>sourceLocationPrefix</name>
-<cardinality>10</cardinality>
-<columnsizes>
-<e>
-<k>prefix</k>
-<v>10</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>external_packages</name>
-<cardinality>119</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>119</v>
-</e>
-<e>
-<k>namespace</k>
-<v>10</v>
-</e>
-<e>
-<k>package_name</k>
-<v>119</v>
-</e>
-<e>
-<k>version</k>
-<v>119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>namespace</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>package_name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>version</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>namespace</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>namespace</src>
-<trg>package_name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>namespace</src>
-<trg>version</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>package_name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>package_name</src>
-<trg>namespace</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>package_name</src>
-<trg>version</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>version</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>version</src>
-<trg>namespace</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>version</src>
-<trg>package_name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>header_to_external_package</name>
-<cardinality>8432</cardinality>
-<columnsizes>
-<e>
-<k>fileid</k>
-<v>8432</v>
-</e>
-<e>
-<k>package</k>
-<v>119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>fileid</src>
-<trg>package</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8432</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>package</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>15</a>
-<b>16</b>
-<v>21</v>
-</b>
-<b>
-<a>63</a>
-<b>64</b>
-<v>10</v>
-</b>
-<b>
-<a>71</a>
-<b>72</b>
-<v>10</v>
-</b>
-<b>
-<a>86</a>
-<b>87</b>
-<v>10</v>
-</b>
-<b>
-<a>253</a>
-<b>254</b>
-<v>10</v>
-</b>
-<b>
-<a>270</a>
-<b>271</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>svnentries</name>
-<cardinality>575525</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>575525</v>
-</e>
-<e>
-<k>revision</k>
-<v>575525</v>
-</e>
-<e>
-<k>author</k>
-<v>19539</v>
-</e>
-<e>
-<k>revisionDate</k>
-<v>547759</v>
-</e>
-<e>
-<k>changeSize</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>revision</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>author</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>revisionDate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>changeSize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revision</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revision</src>
-<trg>author</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revision</src>
-<trg>revisionDate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revision</src>
-<trg>changeSize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>author</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7913</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2531</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1388</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>1523</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>1529</v>
-</b>
-<b>
-<a>10</a>
-<b>20</b>
-<v>1509</v>
-</b>
-<b>
-<a>20</a>
-<b>52</b>
-<v>1488</v>
-</b>
-<b>
-<a>52</a>
-<b>568</b>
-<v>1466</v>
-</b>
-<b>
-<a>569</a>
-<b>16582</b>
-<v>192</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>author</src>
-<trg>revision</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7913</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2531</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1388</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>1523</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>1529</v>
-</b>
-<b>
-<a>10</a>
-<b>20</b>
-<v>1509</v>
-</b>
-<b>
-<a>20</a>
-<b>52</b>
-<v>1488</v>
-</b>
-<b>
-<a>52</a>
-<b>568</b>
-<v>1466</v>
-</b>
-<b>
-<a>569</a>
-<b>16582</b>
-<v>192</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>author</src>
-<trg>revisionDate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7996</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2509</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1379</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>1520</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>1529</v>
-</b>
-<b>
-<a>10</a>
-<b>20</b>
-<v>1507</v>
-</b>
-<b>
-<a>20</a>
-<b>52</b>
-<v>1474</v>
-</b>
-<b>
-<a>52</a>
-<b>662</b>
-<v>1466</v>
-</b>
-<b>
-<a>663</a>
-<b>16573</b>
-<v>159</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>author</src>
-<trg>changeSize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>19539</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revisionDate</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>531878</v>
-</b>
-<b>
-<a>2</a>
-<b>100</b>
-<v>15881</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revisionDate</src>
-<trg>revision</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>531878</v>
-</b>
-<b>
-<a>2</a>
-<b>100</b>
-<v>15881</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revisionDate</src>
-<trg>author</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>542505</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>5254</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>revisionDate</src>
-<trg>changeSize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>547759</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>changeSize</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>575525</a>
-<b>575526</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>changeSize</src>
-<trg>revision</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>575525</a>
-<b>575526</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>changeSize</src>
-<trg>author</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>19539</a>
-<b>19540</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>changeSize</src>
-<trg>revisionDate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>547759</a>
-<b>547760</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>svnaffectedfiles</name>
-<cardinality>1314068</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>531628</v>
-</e>
-<e>
-<k>file</k>
-<v>90924</v>
-</e>
-<e>
-<k>action</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>337698</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>77525</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>43024</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>46689</v>
-</b>
-<b>
-<a>7</a>
-<b>16635</b>
-<v>26692</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>action</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>531628</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11819</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>18230</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>9501</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6656</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>5012</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>7103</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>6788</v>
-</b>
-<b>
-<a>11</a>
-<b>16</b>
-<v>6996</v>
-</b>
-<b>
-<a>16</a>
-<b>26</b>
-<v>7180</v>
-</b>
-<b>
-<a>26</a>
-<b>54</b>
-<v>6824</v>
-</b>
-<b>
-<a>54</a>
-<b>3572</b>
-<v>4815</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>action</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>90924</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>action</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>531628</a>
-<b>531629</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>action</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>90924</a>
-<b>90925</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>svnentrymsg</name>
-<cardinality>575525</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>575525</v>
-</e>
-<e>
-<k>message</k>
-<v>568305</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>575525</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>message</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>565381</v>
-</b>
-<b>
-<a>2</a>
-<b>142</b>
-<v>2924</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>svnchurn</name>
-<cardinality>46790</cardinality>
-<columnsizes>
-<e>
-<k>commit</k>
-<v>22361</v>
-</e>
-<e>
-<k>file</k>
-<v>16124</v>
-</e>
-<e>
-<k>addedLines</k>
-<v>910</v>
-</e>
-<e>
-<k>deletedLines</k>
-<v>787</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>commit</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>15208</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3101</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1746</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>1774</v>
-</b>
-<b>
-<a>8</a>
-<b>246</b>
-<v>532</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>commit</src>
-<trg>addedLines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>16074</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3323</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1561</v>
-</b>
-<b>
-<a>4</a>
-<b>118</b>
-<v>1403</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>commit</src>
-<trg>deletedLines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>16799</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3286</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>1763</v>
-</b>
-<b>
-<a>5</a>
-<b>113</b>
-<v>513</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>commit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8618</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2956</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1426</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>1364</v>
-</b>
-<b>
-<a>6</a>
-<b>12</b>
-<v>1210</v>
-</b>
-<b>
-<a>12</a>
-<b>448</b>
-<v>550</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>addedLines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9240</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3129</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1393</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>1239</v>
-</b>
-<b>
-<a>6</a>
-<b>59</b>
-<v>1123</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>file</src>
-<trg>deletedLines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9525</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3192</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1401</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>1387</v>
-</b>
-<b>
-<a>7</a>
-<b>70</b>
-<v>619</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>addedLines</src>
-<trg>commit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>446</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>133</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>70</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>68</v>
-</b>
-<b>
-<a>6</a>
-<b>12</b>
-<v>70</v>
-</b>
-<b>
-<a>12</a>
-<b>57</b>
-<v>69</v>
-</b>
-<b>
-<a>57</a>
-<b>6874</b>
-<v>54</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>addedLines</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>445</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>132</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>69</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>68</v>
-</b>
-<b>
-<a>6</a>
-<b>12</b>
-<v>73</v>
-</b>
-<b>
-<a>12</a>
-<b>58</b>
-<v>69</v>
-</b>
-<b>
-<a>58</a>
-<b>6663</b>
-<v>54</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>addedLines</src>
-<trg>deletedLines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>621</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>96</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>81</v>
-</b>
-<b>
-<a>7</a>
-<b>34</b>
-<v>70</v>
-</b>
-<b>
-<a>34</a>
-<b>727</b>
-<v>42</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>deletedLines</src>
-<trg>commit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>439</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>116</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>48</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>67</v>
-</b>
-<b>
-<a>8</a>
-<b>28</b>
-<v>60</v>
-</b>
-<b>
-<a>28</a>
-<b>6794</b>
-<v>57</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>deletedLines</src>
-<trg>file</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>437</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>113</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>49</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>61</v>
-</b>
-<b>
-<a>7</a>
-<b>19</b>
-<v>60</v>
-</b>
-<b>
-<a>19</a>
-<b>770</b>
-<v>60</v>
-</b>
-<b>
-<a>985</a>
-<b>7318</b>
-<v>7</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>deletedLines</src>
-<trg>addedLines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>545</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>72</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>69</v>
-</b>
-<b>
-<a>7</a>
-<b>30</b>
-<v>60</v>
-</b>
-<b>
-<a>30</a>
-<b>871</b>
-<v>41</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>locations_default</name>
-<cardinality>8719593</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>8719593</v>
-</e>
-<e>
-<k>container</k>
-<v>70137</v>
-</e>
-<e>
-<k>startLine</k>
-<v>148869</v>
-</e>
-<e>
-<k>startColumn</k>
-<v>5397</v>
-</e>
-<e>
-<k>endLine</k>
-<v>148696</v>
-</e>
-<e>
-<k>endColumn</k>
-<v>10502</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8719593</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8719593</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8719593</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8719593</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8719593</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11391</v>
-</b>
-<b>
-<a>2</a>
-<b>19</b>
-<v>6026</v>
-</b>
-<b>
-<a>19</a>
-<b>25</b>
-<v>5419</v>
-</b>
-<b>
-<a>25</a>
-<b>31</b>
-<v>5451</v>
-</b>
-<b>
-<a>31</a>
-<b>41</b>
-<v>5755</v>
-</b>
-<b>
-<a>41</a>
-<b>54</b>
-<v>5462</v>
-</b>
-<b>
-<a>54</a>
-<b>72</b>
-<v>5538</v>
-</b>
-<b>
-<a>72</a>
-<b>99</b>
-<v>5354</v>
-</b>
-<b>
-<a>99</a>
-<b>137</b>
-<v>5321</v>
-</b>
-<b>
-<a>137</a>
-<b>220</b>
-<v>5267</v>
-</b>
-<b>
-<a>220</a>
-<b>430</b>
-<v>5267</v>
-</b>
-<b>
-<a>430</a>
-<b>20913</b>
-<v>3880</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11391</v>
-</b>
-<b>
-<a>2</a>
-<b>15</b>
-<v>5939</v>
-</b>
-<b>
-<a>15</a>
-<b>20</b>
-<v>6069</v>
-</b>
-<b>
-<a>20</a>
-<b>25</b>
-<v>5484</v>
-</b>
-<b>
-<a>25</a>
-<b>32</b>
-<v>6026</v>
-</b>
-<b>
-<a>32</a>
-<b>41</b>
-<v>5614</v>
-</b>
-<b>
-<a>41</a>
-<b>53</b>
-<v>5657</v>
-</b>
-<b>
-<a>53</a>
-<b>71</b>
-<v>5527</v>
-</b>
-<b>
-<a>71</a>
-<b>99</b>
-<v>5386</v>
-</b>
-<b>
-<a>99</a>
-<b>158</b>
-<v>5267</v>
-</b>
-<b>
-<a>158</a>
-<b>351</b>
-<v>5300</v>
-</b>
-<b>
-<a>351</a>
-<b>9356</b>
-<v>2471</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11391</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>5939</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>6470</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>5332</v>
-</b>
-<b>
-<a>11</a>
-<b>14</b>
-<v>5712</v>
-</b>
-<b>
-<a>14</a>
-<b>18</b>
-<v>6178</v>
-</b>
-<b>
-<a>18</a>
-<b>23</b>
-<v>5690</v>
-</b>
-<b>
-<a>23</a>
-<b>29</b>
-<v>5766</v>
-</b>
-<b>
-<a>29</a>
-<b>37</b>
-<v>5625</v>
-</b>
-<b>
-<a>37</a>
-<b>50</b>
-<v>5603</v>
-</b>
-<b>
-<a>50</a>
-<b>78</b>
-<v>5321</v>
-</b>
-<b>
-<a>78</a>
-<b>168</b>
-<v>1105</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11391</v>
-</b>
-<b>
-<a>2</a>
-<b>15</b>
-<v>5917</v>
-</b>
-<b>
-<a>15</a>
-<b>20</b>
-<v>6091</v>
-</b>
-<b>
-<a>20</a>
-<b>25</b>
-<v>5430</v>
-</b>
-<b>
-<a>25</a>
-<b>32</b>
-<v>6037</v>
-</b>
-<b>
-<a>32</a>
-<b>41</b>
-<v>5603</v>
-</b>
-<b>
-<a>41</a>
-<b>53</b>
-<v>5657</v>
-</b>
-<b>
-<a>53</a>
-<b>70</b>
-<v>5321</v>
-</b>
-<b>
-<a>70</a>
-<b>96</b>
-<v>5278</v>
-</b>
-<b>
-<a>96</a>
-<b>153</b>
-<v>5332</v>
-</b>
-<b>
-<a>153</a>
-<b>333</b>
-<v>5289</v>
-</b>
-<b>
-<a>333</a>
-<b>9356</b>
-<v>2785</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11391</v>
-</b>
-<b>
-<a>2</a>
-<b>14</b>
-<v>5668</v>
-</b>
-<b>
-<a>14</a>
-<b>19</b>
-<v>6048</v>
-</b>
-<b>
-<a>19</a>
-<b>23</b>
-<v>5646</v>
-</b>
-<b>
-<a>23</a>
-<b>28</b>
-<v>6340</v>
-</b>
-<b>
-<a>28</a>
-<b>33</b>
-<v>5451</v>
-</b>
-<b>
-<a>33</a>
-<b>40</b>
-<v>5885</v>
-</b>
-<b>
-<a>40</a>
-<b>47</b>
-<v>5289</v>
-</b>
-<b>
-<a>47</a>
-<b>57</b>
-<v>5538</v>
-</b>
-<b>
-<a>57</a>
-<b>69</b>
-<v>5571</v>
-</b>
-<b>
-<a>69</a>
-<b>91</b>
-<v>5267</v>
-</b>
-<b>
-<a>91</a>
-<b>336</b>
-<v>2037</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30489</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17818</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>17742</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9603</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>13548</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>13255</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>13049</v>
-</b>
-<b>
-<a>13</a>
-<b>32</b>
-<v>11434</v>
-</b>
-<b>
-<a>32</a>
-<b>128</b>
-<v>11185</v>
-</b>
-<b>
-<a>128</a>
-<b>6472</b>
-<v>10741</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>55006</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>33047</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>9787</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>8334</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>12757</v>
-</b>
-<b>
-<a>8</a>
-<b>27</b>
-<v>11358</v>
-</b>
-<b>
-<a>27</a>
-<b>123</b>
-<v>11207</v>
-</b>
-<b>
-<a>123</a>
-<b>6472</b>
-<v>7370</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31584</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17656</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>19563</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9473</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>13754</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>13667</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>12562</v>
-</b>
-<b>
-<a>13</a>
-<b>27</b>
-<v>11348</v>
-</b>
-<b>
-<a>27</a>
-<b>62</b>
-<v>11218</v>
-</b>
-<b>
-<a>62</a>
-<b>153</b>
-<v>8042</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>111649</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17211</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>12388</v>
-</b>
-<b>
-<a>7</a>
-<b>184</b>
-<v>7619</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31432</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17569</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>18425</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9754</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>13570</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>13613</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>12583</v>
-</b>
-<b>
-<a>13</a>
-<b>29</b>
-<v>11521</v>
-</b>
-<b>
-<a>29</a>
-<b>74</b>
-<v>11185</v>
-</b>
-<b>
-<a>74</a>
-<b>258</b>
-<v>9212</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>867</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>997</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>498</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>476</v>
-</b>
-<b>
-<a>8</a>
-<b>16</b>
-<v>433</v>
-</b>
-<b>
-<a>16</a>
-<b>37</b>
-<v>411</v>
-</b>
-<b>
-<a>37</a>
-<b>119</b>
-<v>411</v>
-</b>
-<b>
-<a>124</a>
-<b>512</b>
-<v>411</v>
-</b>
-<b>
-<a>522</a>
-<b>5004</b>
-<v>411</v>
-</b>
-<b>
-<a>5044</a>
-<b>19250</b>
-<v>411</v>
-</b>
-<b>
-<a>19714</a>
-<b>201002</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2319</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>487</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>422</v>
-</b>
-<b>
-<a>6</a>
-<b>15</b>
-<v>433</v>
-</b>
-<b>
-<a>15</a>
-<b>55</b>
-<v>411</v>
-</b>
-<b>
-<a>59</a>
-<b>228</b>
-<v>411</v>
-</b>
-<b>
-<a>231</a>
-<b>1213</b>
-<v>411</v>
-</b>
-<b>
-<a>1274</a>
-<b>2356</b>
-<v>411</v>
-</b>
-<b>
-<a>2555</a>
-<b>6472</b>
-<v>86</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>899</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>986</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>260</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>466</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>422</v>
-</b>
-<b>
-<a>10</a>
-<b>20</b>
-<v>411</v>
-</b>
-<b>
-<a>20</a>
-<b>55</b>
-<v>411</v>
-</b>
-<b>
-<a>56</a>
-<b>194</b>
-<v>411</v>
-</b>
-<b>
-<a>196</a>
-<b>844</b>
-<v>411</v>
-</b>
-<b>
-<a>863</a>
-<b>1976</b>
-<v>411</v>
-</b>
-<b>
-<a>1976</a>
-<b>6604</b>
-<v>303</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>899</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>986</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>260</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>466</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>422</v>
-</b>
-<b>
-<a>10</a>
-<b>20</b>
-<v>411</v>
-</b>
-<b>
-<a>20</a>
-<b>55</b>
-<v>411</v>
-</b>
-<b>
-<a>56</a>
-<b>194</b>
-<v>411</v>
-</b>
-<b>
-<a>206</a>
-<b>843</b>
-<v>411</v>
-</b>
-<b>
-<a>863</a>
-<b>1977</b>
-<v>411</v>
-</b>
-<b>
-<a>1980</a>
-<b>6583</b>
-<v>303</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2449</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>487</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>487</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>422</v>
-</b>
-<b>
-<a>13</a>
-<b>28</b>
-<v>411</v>
-</b>
-<b>
-<a>28</a>
-<b>49</b>
-<v>422</v>
-</b>
-<b>
-<a>50</a>
-<b>103</b>
-<v>411</v>
-</b>
-<b>
-<a>105</a>
-<b>428</b>
-<v>303</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30207</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17851</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>17602</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9754</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>13613</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>13299</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>12898</v>
-</b>
-<b>
-<a>13</a>
-<b>31</b>
-<v>11326</v>
-</b>
-<b>
-<a>31</a>
-<b>125</b>
-<v>11207</v>
-</b>
-<b>
-<a>125</a>
-<b>6472</b>
-<v>10936</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>54724</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>32949</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>9754</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>8443</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>12952</v>
-</b>
-<b>
-<a>8</a>
-<b>27</b>
-<v>11196</v>
-</b>
-<b>
-<a>27</a>
-<b>121</b>
-<v>11163</v>
-</b>
-<b>
-<a>121</a>
-<b>6472</b>
-<v>7511</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>110869</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17049</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>11933</v>
-</b>
-<b>
-<a>7</a>
-<b>46</b>
-<v>8844</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31280</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17732</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>19509</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9494</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>7771</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6058</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>13678</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>12562</v>
-</b>
-<b>
-<a>13</a>
-<b>27</b>
-<v>11358</v>
-</b>
-<b>
-<a>27</a>
-<b>62</b>
-<v>11218</v>
-</b>
-<b>
-<a>62</a>
-<b>153</b>
-<v>8031</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31183</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17537</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>18414</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>9819</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>13656</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>13613</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>12637</v>
-</b>
-<b>
-<a>13</a>
-<b>29</b>
-<v>11380</v>
-</b>
-<b>
-<a>29</a>
-<b>74</b>
-<v>11196</v>
-</b>
-<b>
-<a>74</a>
-<b>258</b>
-<v>9256</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4151</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1159</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>758</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>639</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>867</v>
-</b>
-<b>
-<a>9</a>
-<b>36</b>
-<v>791</v>
-</b>
-<b>
-<a>36</a>
-<b>256</b>
-<v>791</v>
-</b>
-<b>
-<a>257</a>
-<b>7244</b>
-<v>791</v>
-</b>
-<b>
-<a>7397</a>
-<b>25755</b>
-<v>552</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4769</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1257</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>953</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>899</v>
-</b>
-<b>
-<a>7</a>
-<b>31</b>
-<v>791</v>
-</b>
-<b>
-<a>32</a>
-<b>356</b>
-<v>791</v>
-</b>
-<b>
-<a>377</a>
-<b>2696</b>
-<v>791</v>
-</b>
-<b>
-<a>2701</a>
-<b>6472</b>
-<v>249</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4183</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1148</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>791</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>628</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>845</v>
-</b>
-<b>
-<a>9</a>
-<b>34</b>
-<v>791</v>
-</b>
-<b>
-<a>34</a>
-<b>221</b>
-<v>791</v>
-</b>
-<b>
-<a>233</a>
-<b>1884</b>
-<v>791</v>
-</b>
-<b>
-<a>1885</a>
-<b>4894</b>
-<v>531</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4801</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1311</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>942</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>899</v>
-</b>
-<b>
-<a>7</a>
-<b>22</b>
-<v>802</v>
-</b>
-<b>
-<a>22</a>
-<b>45</b>
-<v>791</v>
-</b>
-<b>
-<a>45</a>
-<b>81</b>
-<v>812</v>
-</b>
-<b>
-<a>81</a>
-<b>84</b>
-<v>140</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4183</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1148</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>802</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>628</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>845</v>
-</b>
-<b>
-<a>9</a>
-<b>33</b>
-<v>802</v>
-</b>
-<b>
-<a>34</a>
-<b>234</b>
-<v>791</v>
-</b>
-<b>
-<a>240</a>
-<b>1928</b>
-<v>791</v>
-</b>
-<b>
-<a>1951</a>
-<b>4895</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>locations_stmt</name>
-<cardinality>2179578</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>2179578</v>
-</e>
-<e>
-<k>container</k>
-<v>3177</v>
-</e>
-<e>
-<k>startLine</k>
-<v>296783</v>
-</e>
-<e>
-<k>startColumn</k>
-<v>1229</v>
-</e>
-<e>
-<k>endLine</k>
-<v>294982</v>
-</e>
-<e>
-<k>endColumn</k>
-<v>1493</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2179578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2179578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2179578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2179578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2179578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>7</b>
-<v>288</v>
-</b>
-<b>
-<a>7</a>
-<b>17</b>
-<v>258</v>
-</b>
-<b>
-<a>17</a>
-<b>30</b>
-<v>251</v>
-</b>
-<b>
-<a>30</a>
-<b>53</b>
-<v>239</v>
-</b>
-<b>
-<a>53</a>
-<b>89</b>
-<v>245</v>
-</b>
-<b>
-<a>89</a>
-<b>140</b>
-<v>239</v>
-</b>
-<b>
-<a>140</a>
-<b>213</b>
-<v>245</v>
-</b>
-<b>
-<a>215</a>
-<b>297</b>
-<v>239</v>
-</b>
-<b>
-<a>302</a>
-<b>462</b>
-<v>239</v>
-</b>
-<b>
-<a>464</a>
-<b>739</b>
-<v>239</v>
-</b>
-<b>
-<a>743</a>
-<b>1085</b>
-<v>239</v>
-</b>
-<b>
-<a>1099</a>
-<b>1959</b>
-<v>239</v>
-</b>
-<b>
-<a>1972</a>
-<b>53712</b>
-<v>208</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>6</b>
-<v>239</v>
-</b>
-<b>
-<a>6</a>
-<b>13</b>
-<v>239</v>
-</b>
-<b>
-<a>13</a>
-<b>23</b>
-<v>245</v>
-</b>
-<b>
-<a>23</a>
-<b>37</b>
-<v>239</v>
-</b>
-<b>
-<a>37</a>
-<b>65</b>
-<v>239</v>
-</b>
-<b>
-<a>65</a>
-<b>101</b>
-<v>245</v>
-</b>
-<b>
-<a>102</a>
-<b>155</b>
-<v>239</v>
-</b>
-<b>
-<a>158</a>
-<b>212</b>
-<v>239</v>
-</b>
-<b>
-<a>214</a>
-<b>325</b>
-<v>239</v>
-</b>
-<b>
-<a>328</a>
-<b>516</b>
-<v>239</v>
-</b>
-<b>
-<a>526</a>
-<b>738</b>
-<v>239</v>
-</b>
-<b>
-<a>738</a>
-<b>1166</b>
-<v>239</v>
-</b>
-<b>
-<a>1169</a>
-<b>3598</b>
-<v>239</v>
-</b>
-<b>
-<a>3809</a>
-<b>38985</b>
-<v>49</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>24</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>571</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>202</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>288</v>
-</b>
-<b>
-<a>8</a>
-<b>14</b>
-<v>245</v>
-</b>
-<b>
-<a>14</a>
-<b>20</b>
-<v>264</v>
-</b>
-<b>
-<a>20</a>
-<b>29</b>
-<v>251</v>
-</b>
-<b>
-<a>29</a>
-<b>39</b>
-<v>251</v>
-</b>
-<b>
-<a>39</a>
-<b>51</b>
-<v>251</v>
-</b>
-<b>
-<a>51</a>
-<b>63</b>
-<v>264</v>
-</b>
-<b>
-<a>63</a>
-<b>78</b>
-<v>245</v>
-</b>
-<b>
-<a>78</a>
-<b>107</b>
-<v>245</v>
-</b>
-<b>
-<a>107</a>
-<b>126</b>
-<v>67</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>5</b>
-<v>239</v>
-</b>
-<b>
-<a>5</a>
-<b>13</b>
-<v>282</v>
-</b>
-<b>
-<a>13</a>
-<b>24</b>
-<v>264</v>
-</b>
-<b>
-<a>24</a>
-<b>41</b>
-<v>245</v>
-</b>
-<b>
-<a>43</a>
-<b>67</b>
-<v>239</v>
-</b>
-<b>
-<a>67</a>
-<b>103</b>
-<v>239</v>
-</b>
-<b>
-<a>103</a>
-<b>163</b>
-<v>245</v>
-</b>
-<b>
-<a>163</a>
-<b>230</b>
-<v>239</v>
-</b>
-<b>
-<a>231</a>
-<b>369</b>
-<v>239</v>
-</b>
-<b>
-<a>369</a>
-<b>581</b>
-<v>239</v>
-</b>
-<b>
-<a>581</a>
-<b>811</b>
-<v>239</v>
-</b>
-<b>
-<a>818</a>
-<b>1418</b>
-<v>239</v>
-</b>
-<b>
-<a>1423</a>
-<b>38575</b>
-<v>221</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>4</b>
-<v>282</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>258</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>245</v>
-</b>
-<b>
-<a>13</a>
-<b>21</b>
-<v>251</v>
-</b>
-<b>
-<a>21</a>
-<b>29</b>
-<v>239</v>
-</b>
-<b>
-<a>29</a>
-<b>40</b>
-<v>282</v>
-</b>
-<b>
-<a>40</a>
-<b>49</b>
-<v>264</v>
-</b>
-<b>
-<a>49</a>
-<b>60</b>
-<v>258</v>
-</b>
-<b>
-<a>60</a>
-<b>73</b>
-<v>245</v>
-</b>
-<b>
-<a>73</a>
-<b>84</b>
-<v>239</v>
-</b>
-<b>
-<a>84</a>
-<b>97</b>
-<v>239</v>
-</b>
-<b>
-<a>97</a>
-<b>120</b>
-<v>239</v>
-</b>
-<b>
-<a>120</a>
-<b>172</b>
-<v>129</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>113822</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>78757</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>31327</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>25205</v>
-</b>
-<b>
-<a>6</a>
-<b>16</b>
-<v>22538</v>
-</b>
-<b>
-<a>16</a>
-<b>128</b>
-<v>22347</v>
-</b>
-<b>
-<a>128</a>
-<b>222</b>
-<v>2784</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>175591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>52052</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>22741</v>
-</b>
-<b>
-<a>5</a>
-<b>13</b>
-<v>22415</v>
-</b>
-<b>
-<a>13</a>
-<b>125</b>
-<v>22298</v>
-</b>
-<b>
-<a>125</a>
-<b>176</b>
-<v>1684</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130841</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>73207</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>31204</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>26846</v>
-</b>
-<b>
-<a>7</a>
-<b>17</b>
-<v>23085</v>
-</b>
-<b>
-<a>17</a>
-<b>45</b>
-<v>11597</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>191719</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>47768</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>21726</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>23202</v>
-</b>
-<b>
-<a>9</a>
-<b>30</b>
-<v>12366</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>156052</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>62630</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>21093</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>24707</v>
-</b>
-<b>
-<a>9</a>
-<b>31</b>
-<v>22464</v>
-</b>
-<b>
-<a>31</a>
-<b>73</b>
-<v>9833</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>135</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>79</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>110</v>
-</b>
-<b>
-<a>6</a>
-<b>15</b>
-<v>98</v>
-</b>
-<b>
-<a>15</a>
-<b>29</b>
-<v>104</v>
-</b>
-<b>
-<a>29</a>
-<b>69</b>
-<v>98</v>
-</b>
-<b>
-<a>72</a>
-<b>145</b>
-<v>98</v>
-</b>
-<b>
-<a>149</a>
-<b>318</b>
-<v>98</v>
-</b>
-<b>
-<a>321</a>
-<b>581</b>
-<v>98</v>
-</b>
-<b>
-<a>585</a>
-<b>893</b>
-<v>98</v>
-</b>
-<b>
-<a>905</a>
-<b>2476</b>
-<v>98</v>
-</b>
-<b>
-<a>2724</a>
-<b>38142</b>
-<v>98</v>
-</b>
-<b>
-<a>63637</a>
-<b>75127</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>141</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>86</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>73</v>
-</b>
-<b>
-<a>5</a>
-<b>10</b>
-<v>98</v>
-</b>
-<b>
-<a>11</a>
-<b>18</b>
-<v>98</v>
-</b>
-<b>
-<a>18</a>
-<b>32</b>
-<v>104</v>
-</b>
-<b>
-<a>34</a>
-<b>64</b>
-<v>98</v>
-</b>
-<b>
-<a>66</a>
-<b>92</b>
-<v>98</v>
-</b>
-<b>
-<a>92</a>
-<b>130</b>
-<v>98</v>
-</b>
-<b>
-<a>131</a>
-<b>174</b>
-<v>98</v>
-</b>
-<b>
-<a>174</a>
-<b>208</b>
-<v>104</v>
-</b>
-<b>
-<a>208</a>
-<b>298</b>
-<v>98</v>
-</b>
-<b>
-<a>298</a>
-<b>498</b>
-<v>30</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>135</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>79</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>110</v>
-</b>
-<b>
-<a>6</a>
-<b>15</b>
-<v>98</v>
-</b>
-<b>
-<a>15</a>
-<b>29</b>
-<v>104</v>
-</b>
-<b>
-<a>29</a>
-<b>68</b>
-<v>98</v>
-</b>
-<b>
-<a>70</a>
-<b>143</b>
-<v>98</v>
-</b>
-<b>
-<a>143</a>
-<b>313</b>
-<v>104</v>
-</b>
-<b>
-<a>319</a>
-<b>555</b>
-<v>98</v>
-</b>
-<b>
-<a>603</a>
-<b>830</b>
-<v>98</v>
-</b>
-<b>
-<a>832</a>
-<b>2107</b>
-<v>98</v>
-</b>
-<b>
-<a>2438</a>
-<b>15462</b>
-<v>98</v>
-</b>
-<b>
-<a>18292</a>
-<b>18293</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>135</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>79</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>110</v>
-</b>
-<b>
-<a>6</a>
-<b>15</b>
-<v>98</v>
-</b>
-<b>
-<a>15</a>
-<b>29</b>
-<v>104</v>
-</b>
-<b>
-<a>29</a>
-<b>68</b>
-<v>98</v>
-</b>
-<b>
-<a>70</a>
-<b>144</b>
-<v>98</v>
-</b>
-<b>
-<a>146</a>
-<b>308</b>
-<v>98</v>
-</b>
-<b>
-<a>314</a>
-<b>542</b>
-<v>98</v>
-</b>
-<b>
-<a>554</a>
-<b>801</b>
-<v>98</v>
-</b>
-<b>
-<a>819</a>
-<b>2028</b>
-<v>98</v>
-</b>
-<b>
-<a>2086</a>
-<b>15270</b>
-<v>98</v>
-</b>
-<b>
-<a>15556</a>
-<b>18380</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>153</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>92</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>86</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>98</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>55</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>104</v>
-</b>
-<b>
-<a>9</a>
-<b>12</b>
-<v>98</v>
-</b>
-<b>
-<a>12</a>
-<b>15</b>
-<v>98</v>
-</b>
-<b>
-<a>15</a>
-<b>26</b>
-<v>104</v>
-</b>
-<b>
-<a>26</a>
-<b>35</b>
-<v>98</v>
-</b>
-<b>
-<a>35</a>
-<b>46</b>
-<v>98</v>
-</b>
-<b>
-<a>46</a>
-<b>114</b>
-<v>98</v>
-</b>
-<b>
-<a>131</a>
-<b>203</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>116170</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>72937</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>31948</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>25709</v>
-</b>
-<b>
-<a>6</a>
-<b>16</b>
-<v>23140</v>
-</b>
-<b>
-<a>16</a>
-<b>126</b>
-<v>22138</v>
-</b>
-<b>
-<a>126</a>
-<b>229</b>
-<v>2937</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>175302</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>52249</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>22206</v>
-</b>
-<b>
-<a>5</a>
-<b>14</b>
-<v>23521</v>
-</b>
-<b>
-<a>14</a>
-<b>172</b>
-<v>21702</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>194005</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>42943</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>20940</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>22458</v>
-</b>
-<b>
-<a>8</a>
-<b>32</b>
-<v>14634</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>133004</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>68069</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>32489</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>26723</v>
-</b>
-<b>
-<a>7</a>
-<b>16</b>
-<v>22163</v>
-</b>
-<b>
-<a>16</a>
-<b>46</b>
-<v>12532</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>155948</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>62494</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>21401</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>23890</v>
-</b>
-<b>
-<a>9</a>
-<b>34</b>
-<v>22415</v>
-</b>
-<b>
-<a>34</a>
-<b>73</b>
-<v>8832</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>184</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>135</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>104</v>
-</b>
-<b>
-<a>7</a>
-<b>15</b>
-<v>122</v>
-</b>
-<b>
-<a>16</a>
-<b>43</b>
-<v>116</v>
-</b>
-<b>
-<a>56</a>
-<b>131</b>
-<v>122</v>
-</b>
-<b>
-<a>134</a>
-<b>276</b>
-<v>116</v>
-</b>
-<b>
-<a>283</a>
-<b>620</b>
-<v>116</v>
-</b>
-<b>
-<a>650</a>
-<b>1179</b>
-<v>116</v>
-</b>
-<b>
-<a>1220</a>
-<b>2551</b>
-<v>116</v>
-</b>
-<b>
-<a>2686</a>
-<b>5415</b>
-<v>116</v>
-</b>
-<b>
-<a>5429</a>
-<b>26558</b>
-<v>116</v>
-</b>
-<b>
-<a>36191</a>
-<b>36192</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>215</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>86</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>135</v>
-</b>
-<b>
-<a>6</a>
-<b>12</b>
-<v>129</v>
-</b>
-<b>
-<a>13</a>
-<b>25</b>
-<v>116</v>
-</b>
-<b>
-<a>25</a>
-<b>51</b>
-<v>116</v>
-</b>
-<b>
-<a>55</a>
-<b>89</b>
-<v>116</v>
-</b>
-<b>
-<a>92</a>
-<b>152</b>
-<v>116</v>
-</b>
-<b>
-<a>153</a>
-<b>210</b>
-<v>116</v>
-</b>
-<b>
-<a>210</a>
-<b>266</b>
-<v>116</v>
-</b>
-<b>
-<a>270</a>
-<b>310</b>
-<v>116</v>
-</b>
-<b>
-<a>312</a>
-<b>512</b>
-<v>110</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>184</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>135</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>104</v>
-</b>
-<b>
-<a>7</a>
-<b>15</b>
-<v>122</v>
-</b>
-<b>
-<a>16</a>
-<b>43</b>
-<v>116</v>
-</b>
-<b>
-<a>51</a>
-<b>125</b>
-<v>116</v>
-</b>
-<b>
-<a>128</a>
-<b>254</b>
-<v>116</v>
-</b>
-<b>
-<a>264</a>
-<b>570</b>
-<v>116</v>
-</b>
-<b>
-<a>590</a>
-<b>943</b>
-<v>116</v>
-</b>
-<b>
-<a>1020</a>
-<b>1875</b>
-<v>116</v>
-</b>
-<b>
-<a>1902</a>
-<b>3509</b>
-<v>116</v>
-</b>
-<b>
-<a>3526</a>
-<b>7422</b>
-<v>116</v>
-</b>
-<b>
-<a>8516</a>
-<b>9009</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>202</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>116</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>86</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>135</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>129</v>
-</b>
-<b>
-<a>10</a>
-<b>13</b>
-<v>122</v>
-</b>
-<b>
-<a>13</a>
-<b>16</b>
-<v>122</v>
-</b>
-<b>
-<a>16</a>
-<b>22</b>
-<v>122</v>
-</b>
-<b>
-<a>22</a>
-<b>31</b>
-<v>122</v>
-</b>
-<b>
-<a>31</a>
-<b>38</b>
-<v>129</v>
-</b>
-<b>
-<a>38</a>
-<b>43</b>
-<v>122</v>
-</b>
-<b>
-<a>43</a>
-<b>174</b>
-<v>79</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>184</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>135</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>104</v>
-</b>
-<b>
-<a>7</a>
-<b>15</b>
-<v>122</v>
-</b>
-<b>
-<a>16</a>
-<b>43</b>
-<v>116</v>
-</b>
-<b>
-<a>51</a>
-<b>124</b>
-<v>116</v>
-</b>
-<b>
-<a>127</a>
-<b>251</b>
-<v>116</v>
-</b>
-<b>
-<a>261</a>
-<b>556</b>
-<v>116</v>
-</b>
-<b>
-<a>584</a>
-<b>934</b>
-<v>116</v>
-</b>
-<b>
-<a>1007</a>
-<b>1816</b>
-<v>116</v>
-</b>
-<b>
-<a>1894</a>
-<b>3330</b>
-<v>116</v>
-</b>
-<b>
-<a>3448</a>
-<b>6941</b>
-<v>116</v>
-</b>
-<b>
-<a>8353</a>
-<b>8659</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>locations_expr</name>
-<cardinality>9756708</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>9756708</v>
-</e>
-<e>
-<k>container</k>
-<v>3574</v>
-</e>
-<e>
-<k>startLine</k>
-<v>195321</v>
-</e>
-<e>
-<k>startColumn</k>
-<v>386</v>
-</e>
-<e>
-<k>endLine</k>
-<v>195640</v>
-</e>
-<e>
-<k>endColumn</k>
-<v>456</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9756708</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9756708</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9756708</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9756708</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9756708</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>4</b>
-<v>319</v>
-</b>
-<b>
-<a>4</a>
-<b>10</b>
-<v>269</v>
-</b>
-<b>
-<a>10</a>
-<b>34</b>
-<v>269</v>
-</b>
-<b>
-<a>34</a>
-<b>108</b>
-<v>269</v>
-</b>
-<b>
-<a>108</a>
-<b>205</b>
-<v>270</v>
-</b>
-<b>
-<a>205</a>
-<b>322</b>
-<v>270</v>
-</b>
-<b>
-<a>322</a>
-<b>485</b>
-<v>271</v>
-</b>
-<b>
-<a>486</a>
-<b>746</b>
-<v>269</v>
-</b>
-<b>
-<a>746</a>
-<b>1181</b>
-<v>269</v>
-</b>
-<b>
-<a>1181</a>
-<b>1853</b>
-<v>269</v>
-</b>
-<b>
-<a>1857</a>
-<b>3184</b>
-<v>269</v>
-</b>
-<b>
-<a>3187</a>
-<b>7084</b>
-<v>269</v>
-</b>
-<b>
-<a>7174</a>
-<b>43241</b>
-<v>269</v>
-</b>
-<b>
-<a>43580</a>
-<b>491727</b>
-<v>23</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>302</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>316</v>
-</b>
-<b>
-<a>7</a>
-<b>17</b>
-<v>271</v>
-</b>
-<b>
-<a>17</a>
-<b>36</b>
-<v>277</v>
-</b>
-<b>
-<a>36</a>
-<b>61</b>
-<v>272</v>
-</b>
-<b>
-<a>61</a>
-<b>89</b>
-<v>273</v>
-</b>
-<b>
-<a>89</a>
-<b>137</b>
-<v>270</v>
-</b>
-<b>
-<a>137</a>
-<b>205</b>
-<v>271</v>
-</b>
-<b>
-<a>205</a>
-<b>335</b>
-<v>269</v>
-</b>
-<b>
-<a>335</a>
-<b>524</b>
-<v>269</v>
-</b>
-<b>
-<a>524</a>
-<b>946</b>
-<v>269</v>
-</b>
-<b>
-<a>947</a>
-<b>2043</b>
-<v>269</v>
-</b>
-<b>
-<a>2045</a>
-<b>142752</b>
-<v>246</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>304</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>303</v>
-</b>
-<b>
-<a>7</a>
-<b>17</b>
-<v>272</v>
-</b>
-<b>
-<a>17</a>
-<b>35</b>
-<v>269</v>
-</b>
-<b>
-<a>35</a>
-<b>51</b>
-<v>283</v>
-</b>
-<b>
-<a>51</a>
-<b>63</b>
-<v>290</v>
-</b>
-<b>
-<a>63</a>
-<b>73</b>
-<v>292</v>
-</b>
-<b>
-<a>73</a>
-<b>83</b>
-<v>282</v>
-</b>
-<b>
-<a>83</a>
-<b>92</b>
-<v>271</v>
-</b>
-<b>
-<a>92</a>
-<b>104</b>
-<v>274</v>
-</b>
-<b>
-<a>104</a>
-<b>120</b>
-<v>277</v>
-</b>
-<b>
-<a>120</a>
-<b>145</b>
-<v>270</v>
-</b>
-<b>
-<a>145</a>
-<b>330</b>
-<v>187</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>302</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>313</v>
-</b>
-<b>
-<a>7</a>
-<b>17</b>
-<v>274</v>
-</b>
-<b>
-<a>17</a>
-<b>36</b>
-<v>275</v>
-</b>
-<b>
-<a>36</a>
-<b>61</b>
-<v>272</v>
-</b>
-<b>
-<a>61</a>
-<b>89</b>
-<v>270</v>
-</b>
-<b>
-<a>89</a>
-<b>137</b>
-<v>270</v>
-</b>
-<b>
-<a>137</a>
-<b>205</b>
-<v>270</v>
-</b>
-<b>
-<a>205</a>
-<b>337</b>
-<v>269</v>
-</b>
-<b>
-<a>337</a>
-<b>533</b>
-<v>269</v>
-</b>
-<b>
-<a>533</a>
-<b>946</b>
-<v>269</v>
-</b>
-<b>
-<a>947</a>
-<b>2071</b>
-<v>269</v>
-</b>
-<b>
-<a>2077</a>
-<b>143560</b>
-<v>252</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>container</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>282</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>298</v>
-</b>
-<b>
-<a>7</a>
-<b>19</b>
-<v>282</v>
-</b>
-<b>
-<a>19</a>
-<b>43</b>
-<v>284</v>
-</b>
-<b>
-<a>43</a>
-<b>61</b>
-<v>287</v>
-</b>
-<b>
-<a>61</a>
-<b>74</b>
-<v>294</v>
-</b>
-<b>
-<a>74</a>
-<b>85</b>
-<v>279</v>
-</b>
-<b>
-<a>85</a>
-<b>96</b>
-<v>286</v>
-</b>
-<b>
-<a>96</a>
-<b>107</b>
-<v>280</v>
-</b>
-<b>
-<a>107</a>
-<b>121</b>
-<v>280</v>
-</b>
-<b>
-<a>121</a>
-<b>139</b>
-<v>274</v>
-</b>
-<b>
-<a>139</a>
-<b>167</b>
-<v>271</v>
-</b>
-<b>
-<a>167</a>
-<b>416</b>
-<v>177</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7506</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>28155</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>37070</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>16164</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10348</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>16992</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>17633</v>
-</b>
-<b>
-<a>11</a>
-<b>16</b>
-<v>16438</v>
-</b>
-<b>
-<a>16</a>
-<b>25</b>
-<v>15790</v>
-</b>
-<b>
-<a>25</a>
-<b>97</b>
-<v>14716</v>
-</b>
-<b>
-<a>97</a>
-<b>4266</b>
-<v>14509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>100560</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>34005</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>12707</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>12439</v>
-</b>
-<b>
-<a>5</a>
-<b>12</b>
-<v>15112</v>
-</b>
-<b>
-<a>12</a>
-<b>95</b>
-<v>14670</v>
-</b>
-<b>
-<a>95</a>
-<b>1342</b>
-<v>5828</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7668</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>28146</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>37760</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>16417</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>11671</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>12742</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>16572</v>
-</b>
-<b>
-<a>9</a>
-<b>12</b>
-<v>15812</v>
-</b>
-<b>
-<a>12</a>
-<b>18</b>
-<v>16484</v>
-</b>
-<b>
-<a>18</a>
-<b>39</b>
-<v>14870</v>
-</b>
-<b>
-<a>39</a>
-<b>118</b>
-<v>14836</v>
-</b>
-<b>
-<a>118</a>
-<b>201</b>
-<v>2343</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>93569</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>68359</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>13336</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>16334</v>
-</b>
-<b>
-<a>8</a>
-<b>60</b>
-<v>3723</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startLine</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>17044</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>34830</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>22935</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>15998</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>18855</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>12903</v>
-</b>
-<b>
-<a>8</a>
-<b>10</b>
-<v>13538</v>
-</b>
-<b>
-<a>10</a>
-<b>14</b>
-<v>15565</v>
-</b>
-<b>
-<a>14</a>
-<b>21</b>
-<v>14781</v>
-</b>
-<b>
-<a>21</a>
-<b>61</b>
-<v>14731</v>
-</b>
-<b>
-<a>61</a>
-<b>184</b>
-<v>14141</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>29</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>29</v>
-</b>
-<b>
-<a>8</a>
-<b>23</b>
-<v>29</v>
-</b>
-<b>
-<a>24</a>
-<b>63</b>
-<v>30</v>
-</b>
-<b>
-<a>75</a>
-<b>225</b>
-<v>29</v>
-</b>
-<b>
-<a>232</a>
-<b>684</b>
-<v>29</v>
-</b>
-<b>
-<a>694</a>
-<b>1672</b>
-<v>29</v>
-</b>
-<b>
-<a>1751</a>
-<b>4184</b>
-<v>29</v>
-</b>
-<b>
-<a>4489</a>
-<b>15276</b>
-<v>29</v>
-</b>
-<b>
-<a>16143</a>
-<b>46384</b>
-<v>29</v>
-</b>
-<b>
-<a>48765</a>
-<b>86984</b>
-<v>29</v>
-</b>
-<b>
-<a>87199</a>
-<b>224328</b>
-<v>29</v>
-</b>
-<b>
-<a>237383</a>
-<b>712891</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>76</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>25</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>31</v>
-</b>
-<b>
-<a>7</a>
-<b>19</b>
-<v>30</v>
-</b>
-<b>
-<a>19</a>
-<b>53</b>
-<v>29</v>
-</b>
-<b>
-<a>55</a>
-<b>130</b>
-<v>29</v>
-</b>
-<b>
-<a>132</a>
-<b>341</b>
-<v>29</v>
-</b>
-<b>
-<a>344</a>
-<b>777</b>
-<v>29</v>
-</b>
-<b>
-<a>778</a>
-<b>1426</b>
-<v>29</v>
-</b>
-<b>
-<a>1471</a>
-<b>2095</b>
-<v>29</v>
-</b>
-<b>
-<a>2118</a>
-<b>2433</b>
-<v>29</v>
-</b>
-<b>
-<a>2437</a>
-<b>2810</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>41</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>30</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>29</v>
-</b>
-<b>
-<a>9</a>
-<b>28</b>
-<v>30</v>
-</b>
-<b>
-<a>31</a>
-<b>113</b>
-<v>29</v>
-</b>
-<b>
-<a>120</a>
-<b>349</b>
-<v>29</v>
-</b>
-<b>
-<a>356</a>
-<b>880</b>
-<v>29</v>
-</b>
-<b>
-<a>919</a>
-<b>2301</b>
-<v>29</v>
-</b>
-<b>
-<a>2307</a>
-<b>5125</b>
-<v>29</v>
-</b>
-<b>
-<a>5505</a>
-<b>12957</b>
-<v>29</v>
-</b>
-<b>
-<a>13031</a>
-<b>18247</b>
-<v>29</v>
-</b>
-<b>
-<a>18468</a>
-<b>26386</b>
-<v>29</v>
-</b>
-<b>
-<a>26397</a>
-<b>108382</b>
-<v>24</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>41</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>30</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>29</v>
-</b>
-<b>
-<a>9</a>
-<b>28</b>
-<v>30</v>
-</b>
-<b>
-<a>31</a>
-<b>113</b>
-<v>29</v>
-</b>
-<b>
-<a>120</a>
-<b>349</b>
-<v>29</v>
-</b>
-<b>
-<a>356</a>
-<b>880</b>
-<v>29</v>
-</b>
-<b>
-<a>919</a>
-<b>2301</b>
-<v>29</v>
-</b>
-<b>
-<a>2307</a>
-<b>5126</b>
-<v>29</v>
-</b>
-<b>
-<a>5507</a>
-<b>12959</b>
-<v>29</v>
-</b>
-<b>
-<a>13028</a>
-<b>18367</b>
-<v>29</v>
-</b>
-<b>
-<a>18468</a>
-<b>26374</b>
-<v>29</v>
-</b>
-<b>
-<a>26393</a>
-<b>108398</b>
-<v>24</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>startColumn</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>34</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>37</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>33</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>29</v>
-</b>
-<b>
-<a>9</a>
-<b>18</b>
-<v>30</v>
-</b>
-<b>
-<a>18</a>
-<b>40</b>
-<v>30</v>
-</b>
-<b>
-<a>42</a>
-<b>51</b>
-<v>29</v>
-</b>
-<b>
-<a>51</a>
-<b>73</b>
-<v>29</v>
-</b>
-<b>
-<a>74</a>
-<b>99</b>
-<v>29</v>
-</b>
-<b>
-<a>99</a>
-<b>136</b>
-<v>29</v>
-</b>
-<b>
-<a>136</a>
-<b>166</b>
-<v>30</v>
-</b>
-<b>
-<a>166</a>
-<b>181</b>
-<v>29</v>
-</b>
-<b>
-<a>181</a>
-<b>293</b>
-<v>18</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7754</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>40765</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>7734</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>29998</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10878</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>12021</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>15602</v>
-</b>
-<b>
-<a>9</a>
-<b>13</b>
-<v>17880</v>
-</b>
-<b>
-<a>13</a>
-<b>19</b>
-<v>14695</v>
-</b>
-<b>
-<a>19</a>
-<b>34</b>
-<v>14922</v>
-</b>
-<b>
-<a>34</a>
-<b>233</b>
-<v>14683</v>
-</b>
-<b>
-<a>233</a>
-<b>4272</b>
-<v>8708</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>100438</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>34143</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>12560</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>12621</v>
-</b>
-<b>
-<a>5</a>
-<b>11</b>
-<v>14795</v>
-</b>
-<b>
-<a>11</a>
-<b>88</b>
-<v>14707</v>
-</b>
-<b>
-<a>88</a>
-<b>1343</b>
-<v>6376</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>118668</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>22776</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>30958</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>17210</v>
-</b>
-<b>
-<a>7</a>
-<b>23</b>
-<v>6028</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7907</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>40677</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>8232</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>30893</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10994</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>13979</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>16931</v>
-</b>
-<b>
-<a>9</a>
-<b>12</b>
-<v>16730</v>
-</b>
-<b>
-<a>12</a>
-<b>18</b>
-<v>16864</v>
-</b>
-<b>
-<a>18</a>
-<b>38</b>
-<v>14833</v>
-</b>
-<b>
-<a>38</a>
-<b>116</b>
-<v>14846</v>
-</b>
-<b>
-<a>116</a>
-<b>201</b>
-<v>2754</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endLine</src>
-<trg>endColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32161</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>18779</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>8001</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>30465</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>18987</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>17087</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>16321</v>
-</b>
-<b>
-<a>11</a>
-<b>16</b>
-<v>15572</v>
-</b>
-<b>
-<a>16</a>
-<b>27</b>
-<v>14835</v>
-</b>
-<b>
-<a>27</a>
-<b>94</b>
-<v>14740</v>
-</b>
-<b>
-<a>94</a>
-<b>184</b>
-<v>8692</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>28</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>38</v>
-</b>
-<b>
-<a>3</a>
-<b>9</b>
-<v>38</v>
-</b>
-<b>
-<a>9</a>
-<b>15</b>
-<v>37</v>
-</b>
-<b>
-<a>15</a>
-<b>34</b>
-<v>35</v>
-</b>
-<b>
-<a>34</a>
-<b>173</b>
-<v>35</v>
-</b>
-<b>
-<a>174</a>
-<b>506</b>
-<v>35</v>
-</b>
-<b>
-<a>522</a>
-<b>1595</b>
-<v>35</v>
-</b>
-<b>
-<a>1667</a>
-<b>5254</b>
-<v>35</v>
-</b>
-<b>
-<a>5327</a>
-<b>18561</b>
-<v>35</v>
-</b>
-<b>
-<a>20354</a>
-<b>51707</b>
-<v>35</v>
-</b>
-<b>
-<a>54831</a>
-<b>117890</b>
-<v>35</v>
-</b>
-<b>
-<a>117994</a>
-<b>185975</b>
-<v>35</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>container</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>99</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>42</v>
-</b>
-<b>
-<a>3</a>
-<b>8</b>
-<v>37</v>
-</b>
-<b>
-<a>8</a>
-<b>28</b>
-<v>36</v>
-</b>
-<b>
-<a>28</a>
-<b>70</b>
-<v>35</v>
-</b>
-<b>
-<a>70</a>
-<b>207</b>
-<v>35</v>
-</b>
-<b>
-<a>226</a>
-<b>589</b>
-<v>35</v>
-</b>
-<b>
-<a>602</a>
-<b>1192</b>
-<v>35</v>
-</b>
-<b>
-<a>1208</a>
-<b>1967</b>
-<v>35</v>
-</b>
-<b>
-<a>1970</a>
-<b>2479</b>
-<v>35</v>
-</b>
-<b>
-<a>2482</a>
-<b>2650</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>startLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>44</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>38</v>
-</b>
-<b>
-<a>4</a>
-<b>10</b>
-<v>32</v>
-</b>
-<b>
-<a>10</a>
-<b>16</b>
-<v>37</v>
-</b>
-<b>
-<a>16</a>
-<b>50</b>
-<v>35</v>
-</b>
-<b>
-<a>52</a>
-<b>234</b>
-<v>35</v>
-</b>
-<b>
-<a>243</a>
-<b>667</b>
-<v>35</v>
-</b>
-<b>
-<a>682</a>
-<b>2061</b>
-<v>35</v>
-</b>
-<b>
-<a>2070</a>
-<b>5994</b>
-<v>35</v>
-</b>
-<b>
-<a>6052</a>
-<b>12974</b>
-<v>35</v>
-</b>
-<b>
-<a>13162</a>
-<b>20941</b>
-<v>35</v>
-</b>
-<b>
-<a>20996</a>
-<b>28030</b>
-<v>35</v>
-</b>
-<b>
-<a>29280</a>
-<b>55693</b>
-<v>25</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>startColumn</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>45</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>56</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>37</v>
-</b>
-<b>
-<a>5</a>
-<b>13</b>
-<v>36</v>
-</b>
-<b>
-<a>13</a>
-<b>35</b>
-<v>37</v>
-</b>
-<b>
-<a>35</a>
-<b>54</b>
-<v>35</v>
-</b>
-<b>
-<a>54</a>
-<b>64</b>
-<v>36</v>
-</b>
-<b>
-<a>65</a>
-<b>82</b>
-<v>36</v>
-</b>
-<b>
-<a>82</a>
-<b>102</b>
-<v>36</v>
-</b>
-<b>
-<a>102</a>
-<b>125</b>
-<v>38</v>
-</b>
-<b>
-<a>125</a>
-<b>135</b>
-<v>35</v>
-</b>
-<b>
-<a>135</a>
-<b>156</b>
-<v>29</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>endColumn</src>
-<trg>endLine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>44</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>38</v>
-</b>
-<b>
-<a>4</a>
-<b>10</b>
-<v>32</v>
-</b>
-<b>
-<a>10</a>
-<b>16</b>
-<v>37</v>
-</b>
-<b>
-<a>16</a>
-<b>50</b>
-<v>35</v>
-</b>
-<b>
-<a>52</a>
-<b>234</b>
-<v>35</v>
-</b>
-<b>
-<a>243</a>
-<b>666</b>
-<v>35</v>
-</b>
-<b>
-<a>682</a>
-<b>2062</b>
-<v>35</v>
-</b>
-<b>
-<a>2067</a>
-<b>5995</b>
-<v>35</v>
-</b>
-<b>
-<a>6041</a>
-<b>12938</b>
-<v>35</v>
-</b>
-<b>
-<a>13154</a>
-<b>20904</b>
-<v>35</v>
-</b>
-<b>
-<a>21020</a>
-<b>28041</b>
-<v>35</v>
-</b>
-<b>
-<a>29290</a>
-<b>55694</b>
-<v>25</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>numlines</name>
-<cardinality>493411</cardinality>
-<columnsizes>
-<e>
-<k>element_id</k>
-<v>486528</v>
-</e>
-<e>
-<k>num_lines</k>
-<v>9234</v>
-</e>
-<e>
-<k>num_code</k>
-<v>7207</v>
-</e>
-<e>
-<k>num_comment</k>
-<v>3891</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>element_id</src>
-<trg>num_lines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>479722</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>6806</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element_id</src>
-<trg>num_code</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>479776</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>6752</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element_id</src>
-<trg>num_comment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>486452</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>75</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_lines</src>
-<trg>element_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4205</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1235</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>693</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>726</v>
-</b>
-<b>
-<a>6</a>
-<b>12</b>
-<v>693</v>
-</b>
-<b>
-<a>12</a>
-<b>24</b>
-<v>704</v>
-</b>
-<b>
-<a>24</a>
-<b>121</b>
-<v>693</v>
-</b>
-<b>
-<a>121</a>
-<b>7771</b>
-<v>281</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_lines</src>
-<trg>num_code</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4270</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1246</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>704</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>747</v>
-</b>
-<b>
-<a>6</a>
-<b>11</b>
-<v>802</v>
-</b>
-<b>
-<a>11</a>
-<b>18</b>
-<v>726</v>
-</b>
-<b>
-<a>18</a>
-<b>30</b>
-<v>704</v>
-</b>
-<b>
-<a>30</a>
-<b>32</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_lines</src>
-<trg>num_comment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4259</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1246</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>715</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>758</v>
-</b>
-<b>
-<a>6</a>
-<b>11</b>
-<v>834</v>
-</b>
-<b>
-<a>11</a>
-<b>17</b>
-<v>715</v>
-</b>
-<b>
-<a>17</a>
-<b>27</b>
-<v>704</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_code</src>
-<trg>element_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3143</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>845</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>617</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>552</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>596</v>
-</b>
-<b>
-<a>10</a>
-<b>22</b>
-<v>585</v>
-</b>
-<b>
-<a>22</a>
-<b>101</b>
-<v>541</v>
-</b>
-<b>
-<a>101</a>
-<b>7978</b>
-<v>325</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_code</src>
-<trg>num_lines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3164</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>877</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>628</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>552</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>628</v>
-</b>
-<b>
-<a>10</a>
-<b>21</b>
-<v>606</v>
-</b>
-<b>
-<a>21</a>
-<b>35</b>
-<v>541</v>
-</b>
-<b>
-<a>35</a>
-<b>42</b>
-<v>205</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_code</src>
-<trg>num_comment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3154</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>899</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>628</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>531</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>552</v>
-</b>
-<b>
-<a>9</a>
-<b>17</b>
-<v>552</v>
-</b>
-<b>
-<a>17</a>
-<b>27</b>
-<v>574</v>
-</b>
-<b>
-<a>27</a>
-<b>34</b>
-<v>314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_comment</src>
-<trg>element_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1864</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>401</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>292</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>325</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>325</v>
-</b>
-<b>
-<a>14</a>
-<b>38</b>
-<v>292</v>
-</b>
-<b>
-<a>39</a>
-<b>280</b>
-<v>292</v>
-</b>
-<b>
-<a>286</a>
-<b>36252</b>
-<v>97</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_comment</src>
-<trg>num_lines</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1875</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>411</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>260</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>336</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>325</v>
-</b>
-<b>
-<a>13</a>
-<b>35</b>
-<v>292</v>
-</b>
-<b>
-<a>35</a>
-<b>90</b>
-<v>292</v>
-</b>
-<b>
-<a>91</a>
-<b>119</b>
-<v>97</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_comment</src>
-<trg>num_code</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1875</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>411</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>270</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>325</v>
-</b>
-<b>
-<a>7</a>
-<b>12</b>
-<v>303</v>
-</b>
-<b>
-<a>12</a>
-<b>33</b>
-<v>292</v>
-</b>
-<b>
-<a>33</a>
-<b>82</b>
-<v>292</v>
-</b>
-<b>
-<a>82</a>
-<b>108</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>diagnostics</name>
-<cardinality>67893</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>67893</v>
-</e>
-<e>
-<k>severity</k>
-<v>21</v>
-</e>
-<e>
-<k>error_tag</k>
-<v>75</v>
-</e>
-<e>
-<k>error_message</k>
-<v>97</v>
-</e>
-<e>
-<k>full_error_message</k>
-<v>58789</v>
-</e>
-<e>
-<k>location</k>
-<v>119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>severity</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>error_tag</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>full_error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>severity</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>6262</a>
-<b>6263</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>severity</src>
-<trg>error_tag</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>severity</src>
-<trg>error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>severity</src>
-<trg>full_error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>5422</a>
-<b>5423</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>severity</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_tag</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>417</a>
-<b>418</b>
-<v>10</v>
-</b>
-<b>
-<a>841</a>
-<b>842</b>
-<v>10</v>
-</b>
-<b>
-<a>4996</a>
-<b>4997</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_tag</src>
-<trg>severity</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>75</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_tag</src>
-<trg>error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_tag</src>
-<trg>full_error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>417</a>
-<b>418</b>
-<v>10</v>
-</b>
-<b>
-<a>4996</a>
-<b>4997</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_tag</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>43</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_message</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>10</v>
-</b>
-<b>
-<a>75</a>
-<b>76</b>
-<v>10</v>
-</b>
-<b>
-<a>332</a>
-<b>333</b>
-<v>10</v>
-</b>
-<b>
-<a>841</a>
-<b>842</b>
-<v>10</v>
-</b>
-<b>
-<a>4996</a>
-<b>4997</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_message</src>
-<trg>severity</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>97</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_message</src>
-<trg>error_tag</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>97</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_message</src>
-<trg>full_error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>10</v>
-</b>
-<b>
-<a>75</a>
-<b>76</b>
-<v>10</v>
-</b>
-<b>
-<a>332</a>
-<b>333</b>
-<v>10</v>
-</b>
-<b>
-<a>4996</a>
-<b>4997</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>error_message</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>full_error_message</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>58778</v>
-</b>
-<b>
-<a>841</a>
-<b>842</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>full_error_message</src>
-<trg>severity</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>58789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>full_error_message</src>
-<trg>error_tag</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>58789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>full_error_message</src>
-<trg>error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>58789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>full_error_message</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>58789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>108</v>
-</b>
-<b>
-<a>6254</a>
-<b>6255</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>severity</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>error_tag</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>108</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>108</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>full_error_message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>108</v>
-</b>
-<b>
-<a>5414</a>
-<b>5415</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>files</name>
-<cardinality>59320</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>59320</v>
-</e>
-<e>
-<k>name</k>
-<v>59320</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>59320</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>59320</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>folders</name>
-<cardinality>10817</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>10817</v>
-</e>
-<e>
-<k>name</k>
-<v>10817</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10817</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10817</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>containerparent</name>
-<cardinality>70115</cardinality>
-<columnsizes>
-<e>
-<k>parent</k>
-<v>10817</v>
-</e>
-<e>
-<k>child</k>
-<v>70115</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>parent</src>
-<trg>child</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4931</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1387</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>606</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>997</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>802</v>
-</b>
-<b>
-<a>10</a>
-<b>14</b>
-<v>856</v>
-</b>
-<b>
-<a>14</a>
-<b>30</b>
-<v>823</v>
-</b>
-<b>
-<a>30</a>
-<b>153</b>
-<v>411</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>child</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>70115</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fileannotations</name>
-<cardinality>5090321</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4769</v>
-</e>
-<e>
-<k>kind</k>
-<v>21</v>
-</e>
-<e>
-<k>name</k>
-<v>53987</v>
-</e>
-<e>
-<k>value</k>
-<v>44124</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4638</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>100</b>
-<v>357</v>
-</b>
-<b>
-<a>111</a>
-<b>222</b>
-<v>357</v>
-</b>
-<b>
-<a>224</a>
-<b>290</b>
-<v>357</v>
-</b>
-<b>
-<a>295</a>
-<b>448</b>
-<v>357</v>
-</b>
-<b>
-<a>448</a>
-<b>527</b>
-<v>357</v>
-</b>
-<b>
-<a>533</a>
-<b>623</b>
-<v>390</v>
-</b>
-<b>
-<a>623</a>
-<b>713</b>
-<v>357</v>
-</b>
-<b>
-<a>726</a>
-<b>901</b>
-<v>357</v>
-</b>
-<b>
-<a>901</a>
-<b>931</b>
-<v>75</v>
-</b>
-<b>
-<a>933</a>
-<b>934</b>
-<v>1365</v>
-</b>
-<b>
-<a>1080</a>
-<b>1671</b>
-<v>357</v>
-</b>
-<b>
-<a>1693</a>
-<b>2286</b>
-<v>75</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>112</b>
-<v>357</v>
-</b>
-<b>
-<a>117</a>
-<b>272</b>
-<v>357</v>
-</b>
-<b>
-<a>272</a>
-<b>360</b>
-<v>357</v>
-</b>
-<b>
-<a>379</a>
-<b>633</b>
-<v>357</v>
-</b>
-<b>
-<a>634</a>
-<b>737</b>
-<v>357</v>
-</b>
-<b>
-<a>737</a>
-<b>952</b>
-<v>357</v>
-</b>
-<b>
-<a>952</a>
-<b>1069</b>
-<v>357</v>
-</b>
-<b>
-<a>1083</a>
-<b>1498</b>
-<v>249</v>
-</b>
-<b>
-<a>1498</a>
-<b>1499</b>
-<v>1365</v>
-</b>
-<b>
-<a>1501</a>
-<b>1871</b>
-<v>357</v>
-</b>
-<b>
-<a>1968</a>
-<b>4072</b>
-<v>292</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>428</a>
-<b>429</b>
-<v>10</v>
-</b>
-<b>
-<a>440</a>
-<b>441</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>4979</a>
-<b>4980</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>4071</a>
-<b>4072</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8822</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5961</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>4465</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>4400</v>
-</b>
-<b>
-<a>8</a>
-<b>14</b>
-<v>4357</v>
-</b>
-<b>
-<a>14</a>
-<b>18</b>
-<v>3869</v>
-</b>
-<b>
-<a>18</a>
-<b>21</b>
-<v>4194</v>
-</b>
-<b>
-<a>21</a>
-<b>34</b>
-<v>4346</v>
-</b>
-<b>
-<a>34</a>
-<b>128</b>
-<v>4324</v>
-</b>
-<b>
-<a>129</a>
-<b>236</b>
-<v>4107</v>
-</b>
-<b>
-<a>236</a>
-<b>395</b>
-<v>4064</v>
-</b>
-<b>
-<a>395</a>
-<b>440</b>
-<v>1073</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>53987</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9863</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>7955</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2460</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>3912</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>4823</v>
-</b>
-<b>
-<a>10</a>
-<b>14</b>
-<v>3446</v>
-</b>
-<b>
-<a>14</a>
-<b>18</b>
-<v>4443</v>
-</b>
-<b>
-<a>18</a>
-<b>23</b>
-<v>4151</v>
-</b>
-<b>
-<a>23</a>
-<b>44</b>
-<v>4346</v>
-</b>
-<b>
-<a>44</a>
-<b>97</b>
-<v>4107</v>
-</b>
-<b>
-<a>97</a>
-<b>405</b>
-<v>4053</v>
-</b>
-<b>
-<a>421</a>
-<b>1907</b>
-<v>422</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6817</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>2146</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>3197</v>
-</b>
-<b>
-<a>8</a>
-<b>21</b>
-<v>3392</v>
-</b>
-<b>
-<a>21</a>
-<b>23</b>
-<v>2438</v>
-</b>
-<b>
-<a>23</a>
-<b>25</b>
-<v>3977</v>
-</b>
-<b>
-<a>25</a>
-<b>40</b>
-<v>3197</v>
-</b>
-<b>
-<a>40</a>
-<b>195</b>
-<v>3479</v>
-</b>
-<b>
-<a>195</a>
-<b>207</b>
-<v>3468</v>
-</b>
-<b>
-<a>207</a>
-<b>273</b>
-<v>3620</v>
-</b>
-<b>
-<a>273</a>
-<b>327</b>
-<v>3327</v>
-</b>
-<b>
-<a>328</a>
-<b>407</b>
-<v>3793</v>
-</b>
-<b>
-<a>407</a>
-<b>441</b>
-<v>1268</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>44113</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6839</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>2482</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>3349</v>
-</b>
-<b>
-<a>8</a>
-<b>16</b>
-<v>3457</v>
-</b>
-<b>
-<a>16</a>
-<b>18</b>
-<v>2980</v>
-</b>
-<b>
-<a>18</a>
-<b>21</b>
-<v>3696</v>
-</b>
-<b>
-<a>21</a>
-<b>31</b>
-<v>3836</v>
-</b>
-<b>
-<a>31</a>
-<b>41</b>
-<v>3490</v>
-</b>
-<b>
-<a>41</a>
-<b>54</b>
-<v>3490</v>
-</b>
-<b>
-<a>54</a>
-<b>80</b>
-<v>3370</v>
-</b>
-<b>
-<a>80</a>
-<b>108</b>
-<v>3316</v>
-</b>
-<b>
-<a>108</a>
-<b>130</b>
-<v>3360</v>
-</b>
-<b>
-<a>130</a>
-<b>149</b>
-<v>455</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>inmacroexpansion</name>
-<cardinality>60947411</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>15711684</v>
-</e>
-<e>
-<k>inv</k>
-<v>2534941</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>inv</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3622961</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2447710</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1901765</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1934999</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>1869000</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>969866</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>1533539</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>1256082</v>
-</b>
-<b>
-<a>11</a>
-<b>6193</b>
-<v>175759</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>inv</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>617221</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>370194</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>158077</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>257870</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>184829</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>150858</v>
-</b>
-<b>
-<a>9</a>
-<b>12</b>
-<v>222012</v>
-</b>
-<b>
-<a>12</a>
-<b>22</b>
-<v>203086</v>
-</b>
-<b>
-<a>22</a>
-<b>45</b>
-<v>191643</v>
-</b>
-<b>
-<a>45</a>
-<b>153127</b>
-<v>179147</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>affectedbymacroexpansion</name>
-<cardinality>35536226</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4085077</v>
-</e>
-<e>
-<k>inv</k>
-<v>3283853</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>inv</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1342436</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>719533</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>683055</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>321085</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>313623</v>
-</b>
-<b>
-<a>10</a>
-<b>24</b>
-<v>308123</v>
-</b>
-<b>
-<a>24</a>
-<b>64</b>
-<v>310009</v>
-</b>
-<b>
-<a>64</a>
-<b>9803</b>
-<v>87208</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>inv</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>253292</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>210096</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>202616</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>258141</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>301644</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>247926</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>231166</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>228049</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>182555</v>
-</b>
-<b>
-<a>10</a>
-<b>12</b>
-<v>285738</v>
-</b>
-<b>
-<a>12</a>
-<b>16</b>
-<v>297490</v>
-</b>
-<b>
-<a>16</a>
-<b>23</b>
-<v>275437</v>
-</b>
-<b>
-<a>23</a>
-<b>60</b>
-<v>249014</v>
-</b>
-<b>
-<a>60</a>
-<b>526</b>
-<v>60681</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>macroinvocations</name>
-<cardinality>34675701</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>34675701</v>
-</e>
-<e>
-<k>macro_id</k>
-<v>80282</v>
-</e>
-<e>
-<k>location</k>
-<v>752316</v>
-</e>
-<e>
-<k>kind</k>
-<v>21</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>macro_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>34675701</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>34675701</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>34675701</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>macro_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>17136</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>16778</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>3761</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>7034</v>
-</b>
-<b>
-<a>6</a>
-<b>11</b>
-<v>7392</v>
-</b>
-<b>
-<a>11</a>
-<b>21</b>
-<v>6405</v>
-</b>
-<b>
-<a>21</a>
-<b>47</b>
-<v>6188</v>
-</b>
-<b>
-<a>47</a>
-<b>151</b>
-<v>6069</v>
-</b>
-<b>
-<a>151</a>
-<b>1013</b>
-<v>6026</v>
-</b>
-<b>
-<a>1014</a>
-<b>196742</b>
-<v>3490</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>macro_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>42715</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10621</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>5278</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>6893</v>
-</b>
-<b>
-<a>6</a>
-<b>13</b>
-<v>6644</v>
-</b>
-<b>
-<a>13</a>
-<b>66</b>
-<v>6037</v>
-</b>
-<b>
-<a>66</a>
-<b>3614</b>
-<v>2091</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>macro_id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>74212</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6069</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>285069</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>194240</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>45143</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>55916</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>68457</v>
-</b>
-<b>
-<a>9</a>
-<b>26</b>
-<v>60523</v>
-</b>
-<b>
-<a>26</a>
-<b>257817</b>
-<v>42964</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>macro_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>704181</v>
-</b>
-<b>
-<a>2</a>
-<b>354</b>
-<v>48134</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>752316</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>21794</a>
-<b>21795</b>
-<v>10</v>
-</b>
-<b>
-<a>3177447</a>
-<b>3177448</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>macro_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2221</a>
-<b>2222</b>
-<v>10</v>
-</b>
-<b>
-<a>5746</a>
-<b>5747</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6578</a>
-<b>6579</b>
-<v>10</v>
-</b>
-<b>
-<a>62832</a>
-<b>62833</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>macroparent</name>
-<cardinality>31212468</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>31212468</v>
-</e>
-<e>
-<k>parent_id</k>
-<v>24288060</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>parent_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31212468</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18677382</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4783954</v>
-</b>
-<b>
-<a>3</a>
-<b>88</b>
-<v>826723</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>macrolocationbind</name>
-<cardinality>4019158</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>2802505</v>
-</e>
-<e>
-<k>location</k>
-<v>2006328</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2201458</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>339388</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>231860</v>
-</b>
-<b>
-<a>7</a>
-<b>57</b>
-<v>29796</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1604130</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>171086</v>
-</b>
-<b>
-<a>3</a>
-<b>8</b>
-<v>155542</v>
-</b>
-<b>
-<a>8</a>
-<b>723</b>
-<v>75567</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>macro_argument_unexpanded</name>
-<cardinality>91317451</cardinality>
-<columnsizes>
-<e>
-<k>invocation</k>
-<v>26939874</v>
-</e>
-<e>
-<k>argument_index</k>
-<v>715</v>
-</e>
-<e>
-<k>text</k>
-<v>309012</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>invocation</src>
-<trg>argument_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7463526</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>11300240</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6167062</v>
-</b>
-<b>
-<a>4</a>
-<b>67</b>
-<v>2009044</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>invocation</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7530509</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>11447007</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6003116</v>
-</b>
-<b>
-<a>4</a>
-<b>67</b>
-<v>1959240</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>argument_index</src>
-<trg>invocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>50779</a>
-<b>50780</b>
-<v>628</v>
-</b>
-<b>
-<a>50981</a>
-<b>185359</b>
-<v>54</v>
-</b>
-<b>
-<a>754342</a>
-<b>2485521</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>argument_index</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>628</v>
-</b>
-<b>
-<a>13</a>
-<b>1004</b>
-<v>54</v>
-</b>
-<b>
-<a>6629</a>
-<b>19723</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>invocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>37588</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>61759</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>14252</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>41761</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>25416</v>
-</b>
-<b>
-<a>8</a>
-<b>12</b>
-<v>15466</v>
-</b>
-<b>
-<a>12</a>
-<b>16</b>
-<v>20918</v>
-</b>
-<b>
-<a>16</a>
-<b>23</b>
-<v>25709</v>
-</b>
-<b>
-<a>23</a>
-<b>43</b>
-<v>23205</v>
-</b>
-<b>
-<a>43</a>
-<b>154</b>
-<v>23216</v>
-</b>
-<b>
-<a>154</a>
-<b>566476</b>
-<v>19715</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>argument_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>223418</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>75415</v>
-</b>
-<b>
-<a>3</a>
-<b>9</b>
-<v>10177</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>macro_argument_expanded</name>
-<cardinality>91317451</cardinality>
-<columnsizes>
-<e>
-<k>invocation</k>
-<v>26939874</v>
-</e>
-<e>
-<k>argument_index</k>
-<v>715</v>
-</e>
-<e>
-<k>text</k>
-<v>187228</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>invocation</src>
-<trg>argument_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7463526</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>11300240</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6167062</v>
-</b>
-<b>
-<a>4</a>
-<b>67</b>
-<v>2009044</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>invocation</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10915238</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>9757326</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>5190905</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>1076404</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>argument_index</src>
-<trg>invocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>50779</a>
-<b>50780</b>
-<v>628</v>
-</b>
-<b>
-<a>50981</a>
-<b>185359</b>
-<v>54</v>
-</b>
-<b>
-<a>754342</a>
-<b>2485521</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>argument_index</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>617</v>
-</b>
-<b>
-<a>2</a>
-<b>76</b>
-<v>54</v>
-</b>
-<b>
-<a>869</a>
-<b>13996</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>invocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>22717</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>38694</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6449</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>15293</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3468</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>21883</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>14599</v>
-</b>
-<b>
-<a>9</a>
-<b>15</b>
-<v>16225</v>
-</b>
-<b>
-<a>15</a>
-<b>31</b>
-<v>14914</v>
-</b>
-<b>
-<a>31</a>
-<b>97</b>
-<v>14198</v>
-</b>
-<b>
-<a>97</a>
-<b>559</b>
-<v>14057</v>
-</b>
-<b>
-<a>560</a>
-<b>1126278</b>
-<v>4725</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>argument_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>94513</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>78559</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>14079</v>
-</b>
-<b>
-<a>6</a>
-<b>66</b>
-<v>75</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>functions</name>
-<cardinality>3658482</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>3658482</v>
-</e>
-<e>
-<k>name</k>
-<v>292298</v>
-</e>
-<e>
-<k>kind</k>
-<v>75</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3658482</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3658482</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>195541</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>29091</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>26912</v>
-</b>
-<b>
-<a>5</a>
-<b>12</b>
-<v>21948</v>
-</b>
-<b>
-<a>12</a>
-<b>123481</b>
-<v>18805</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>290304</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1994</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>32</a>
-<b>33</b>
-<v>10</v>
-</b>
-<b>
-<a>479</a>
-<b>480</b>
-<v>10</v>
-</b>
-<b>
-<a>2829</a>
-<b>2830</b>
-<v>10</v>
-</b>
-<b>
-<a>6206</a>
-<b>6207</b>
-<v>10</v>
-</b>
-<b>
-<a>66392</a>
-<b>66393</b>
-<v>10</v>
-</b>
-<b>
-<a>114718</a>
-<b>114719</b>
-<v>10</v>
-</b>
-<b>
-<a>146882</a>
-<b>146883</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-<b>
-<a>42</a>
-<b>43</b>
-<v>10</v>
-</b>
-<b>
-<a>230</a>
-<b>231</b>
-<v>10</v>
-</b>
-<b>
-<a>1495</a>
-<b>1496</b>
-<v>10</v>
-</b>
-<b>
-<a>2829</a>
-<b>2830</b>
-<v>10</v>
-</b>
-<b>
-<a>3603</a>
-<b>3604</b>
-<v>10</v>
-</b>
-<b>
-<a>18942</a>
-<b>18943</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>function_entry_point</name>
-<cardinality>996664</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>993781</v>
-</e>
-<e>
-<k>entry_point</k>
-<v>996664</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>entry_point</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>991169</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>2612</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>entry_point</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>996664</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>function_return_type</name>
-<cardinality>3668529</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>3658016</v>
-</e>
-<e>
-<k>return_type</k>
-<v>1011394</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>return_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3647990</v>
-</b>
-<b>
-<a>2</a>
-<b>6</b>
-<v>10025</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>return_type</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>295658</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>654745</v>
-</b>
-<b>
-<a>3</a>
-<b>105613</b>
-<v>60989</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>coroutine</name>
-<cardinality>2</cardinality>
-<columnsizes>
-<e>
-<k>function</k>
-<v>2</v>
-</e>
-<e>
-<k>traits</k>
-<v>2</v>
-</e>
-<e>
-<k>handle</k>
-<v>2</v>
-</e>
-<e>
-<k>promise</k>
-<v>2</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>function</src>
-<trg>traits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>handle</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>promise</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>traits</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>traits</src>
-<trg>handle</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>traits</src>
-<trg>promise</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>handle</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>handle</src>
-<trg>traits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>handle</src>
-<trg>promise</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>promise</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>promise</src>
-<trg>traits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>promise</src>
-<trg>handle</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>coroutine_new</name>
-<cardinality>2</cardinality>
-<columnsizes>
-<e>
-<k>function</k>
-<v>2</v>
-</e>
-<e>
-<k>new</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>function</src>
-<trg>new</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>new</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>coroutine_delete</name>
-<cardinality>2</cardinality>
-<columnsizes>
-<e>
-<k>function</k>
-<v>2</v>
-</e>
-<e>
-<k>delete</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>function</src>
-<trg>delete</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>delete</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>purefunctions</name>
-<cardinality>20715</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>20715</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>function_deleted</name>
-<cardinality>55526</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>55526</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>function_defaulted</name>
-<cardinality>12778</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>12778</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>member_function_this_type</name>
-<cardinality>517224</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>517224</v>
-</e>
-<e>
-<k>this_type</k>
-<v>169365</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>this_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>517224</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>this_type</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>61813</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>44037</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>22035</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>14838</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>13526</v>
-</b>
-<b>
-<a>7</a>
-<b>36</b>
-<v>12724</v>
-</b>
-<b>
-<a>40</a>
-<b>87</b>
-<v>390</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fun_decls</name>
-<cardinality>3733464</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>3730234</v>
-</e>
-<e>
-<k>function</k>
-<v>3566244</v>
-</e>
-<e>
-<k>type_id</k>
-<v>998474</v>
-</e>
-<e>
-<k>name</k>
-<v>261115</v>
-</e>
-<e>
-<k>location</k>
-<v>786132</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3730234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3727286</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>2948</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3730234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3730234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3431649</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>134595</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3549780</v>
-</b>
-<b>
-<a>2</a>
-<b>6</b>
-<v>16464</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3566244</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3479621</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>86623</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>277048</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>653141</v>
-</b>
-<b>
-<a>3</a>
-<b>110973</b>
-<v>68283</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>288743</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>649532</v>
-</b>
-<b>
-<a>3</a>
-<b>104729</b>
-<v>60198</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>932715</v>
-</b>
-<b>
-<a>2</a>
-<b>8223</b>
-<v>65758</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>902215</v>
-</b>
-<b>
-<a>2</a>
-<b>6</b>
-<v>79209</v>
-</b>
-<b>
-<a>6</a>
-<b>24198</b>
-<v>17049</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154159</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>30023</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>16344</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>20062</v>
-</b>
-<b>
-<a>6</a>
-<b>13</b>
-<v>20929</v>
-</b>
-<b>
-<a>13</a>
-<b>9944</b>
-<v>19585</v>
-</b>
-<b>
-<a>123729</a>
-<b>123730</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>164672</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>29264</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>14827</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>22349</v>
-</b>
-<b>
-<a>7</a>
-<b>23</b>
-<v>19737</v>
-</b>
-<b>
-<a>23</a>
-<b>123465</b>
-<v>10264</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>228903</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>20669</v>
-</b>
-<b>
-<a>5</a>
-<b>63247</b>
-<v>11543</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>168477</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>43528</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>16409</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>20897</v>
-</b>
-<b>
-<a>8</a>
-<b>8921</b>
-<v>11803</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>516530</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>130379</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>50681</v>
-</b>
-<b>
-<a>4</a>
-<b>13</b>
-<v>61358</v>
-</b>
-<b>
-<a>13</a>
-<b>3043</b>
-<v>27183</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>531281</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>143190</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>65780</v>
-</b>
-<b>
-<a>7</a>
-<b>3043</b>
-<v>45880</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>681604</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>62355</v>
-</b>
-<b>
-<a>3</a>
-<b>1522</b>
-<v>42173</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>742691</v>
-</b>
-<b>
-<a>2</a>
-<b>134</b>
-<v>43441</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fun_def</name>
-<cardinality>1230856</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1230856</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>fun_specialized</name>
-<cardinality>6411</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>6411</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>fun_implicit</name>
-<cardinality>14</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>14</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>fun_decl_specifiers</name>
-<cardinality>485928</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>261005</v>
-</e>
-<e>
-<k>name</k>
-<v>6</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>69347</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>158393</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>33264</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>24036</a>
-<b>24037</b>
-<v>1</v>
-</b>
-<b>
-<a>34427</a>
-<b>34428</b>
-<v>1</v>
-</b>
-<b>
-<a>79541</a>
-<b>79542</b>
-<v>1</v>
-</b>
-<b>
-<a>160143</a>
-<b>160144</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fun_decl_throws</name>
-<cardinality>7</cardinality>
-<columnsizes>
-<e>
-<k>fun_decl</k>
-<v>7</v>
-</e>
-<e>
-<k>index</k>
-<v>1</v>
-</e>
-<e>
-<k>type_id</k>
-<v>2</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>fun_decl</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fun_decl</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>fun_decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>7</a>
-<b>8</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>fun_decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fun_decl_empty_throws</name>
-<cardinality>1620964</cardinality>
-<columnsizes>
-<e>
-<k>fun_decl</k>
-<v>1620964</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>fun_decl_noexcept</name>
-<cardinality>32527</cardinality>
-<columnsizes>
-<e>
-<k>fun_decl</k>
-<v>31746</v>
-</e>
-<e>
-<k>constant</k>
-<v>32407</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>fun_decl</src>
-<trg>constant</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30966</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>780</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>constant</src>
-<trg>fun_decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32288</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fun_decl_empty_noexcept</name>
-<cardinality>401889</cardinality>
-<columnsizes>
-<e>
-<k>fun_decl</k>
-<v>401889</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>fun_decl_typedef_type</name>
-<cardinality>173</cardinality>
-<columnsizes>
-<e>
-<k>fun_decl</k>
-<v>173</v>
-</e>
-<e>
-<k>typedeftype_id</k>
-<v>86</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>fun_decl</src>
-<trg>typedeftype_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>173</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>typedeftype_id</src>
-<trg>fun_decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>86</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>param_decl_bind</name>
-<cardinality>4596444</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4596444</v>
-</e>
-<e>
-<k>index</k>
-<v>693</v>
-</e>
-<e>
-<k>fun_decl</k>
-<v>3035277</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4596444</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fun_decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4596444</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>346</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>140</v>
-</b>
-<b>
-<a>6</a>
-<b>118</b>
-<v>54</v>
-</b>
-<b>
-<a>191</a>
-<b>616</b>
-<v>54</v>
-</b>
-<b>
-<a>886</a>
-<b>5115</b>
-<v>54</v>
-</b>
-<b>
-<a>14149</a>
-<b>280041</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>fun_decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>346</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>140</v>
-</b>
-<b>
-<a>6</a>
-<b>118</b>
-<v>54</v>
-</b>
-<b>
-<a>191</a>
-<b>616</b>
-<v>54</v>
-</b>
-<b>
-<a>886</a>
-<b>5115</b>
-<v>54</v>
-</b>
-<b>
-<a>14149</a>
-<b>280041</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fun_decl</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2169165</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>472882</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>239871</v>
-</b>
-<b>
-<a>4</a>
-<b>65</b>
-<v>153357</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fun_decl</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2169165</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>472882</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>239871</v>
-</b>
-<b>
-<a>4</a>
-<b>65</b>
-<v>153357</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>var_decls</name>
-<cardinality>5305568</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>5296821</v>
-</e>
-<e>
-<k>variable</k>
-<v>5071603</v>
-</e>
-<e>
-<k>type_id</k>
-<v>1983812</v>
-</e>
-<e>
-<k>name</k>
-<v>124829</v>
-</e>
-<e>
-<k>location</k>
-<v>1218002</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>variable</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5296821</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5288258</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>8562</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5296821</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5296777</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>variable</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4886293</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>185309</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>variable</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5036670</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>34933</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>variable</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5054239</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17363</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>variable</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4964657</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>106945</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1561936</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>226215</v>
-</b>
-<b>
-<a>3</a>
-<b>11</b>
-<v>155091</v>
-</b>
-<b>
-<a>11</a>
-<b>5924</b>
-<v>40569</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>variable</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1585846</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>217088</v>
-</b>
-<b>
-<a>3</a>
-<b>13</b>
-<v>149325</v>
-</b>
-<b>
-<a>13</a>
-<b>5424</b>
-<v>31551</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1811043</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>149422</v>
-</b>
-<b>
-<a>5</a>
-<b>772</b>
-<v>23346</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1737523</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>152685</v>
-</b>
-<b>
-<a>4</a>
-<b>3608</b>
-<v>93603</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>51483</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>19054</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10784</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>7597</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>10394</v>
-</b>
-<b>
-<a>8</a>
-<b>15</b>
-<v>9397</v>
-</b>
-<b>
-<a>15</a>
-<b>47</b>
-<v>9418</v>
-</b>
-<b>
-<a>47</a>
-<b>165594</b>
-<v>6698</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>variable</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>54269</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>18610</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>11673</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>11066</v>
-</b>
-<b>
-<a>6</a>
-<b>11</b>
-<v>10611</v>
-</b>
-<b>
-<a>11</a>
-<b>27</b>
-<v>9375</v>
-</b>
-<b>
-<a>27</a>
-<b>164566</b>
-<v>9223</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>75405</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>16702</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>8757</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>10350</v>
-</b>
-<b>
-<a>7</a>
-<b>27</b>
-<v>9408</v>
-</b>
-<b>
-<a>27</a>
-<b>125771</b>
-<v>4205</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>71969</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>18805</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6893</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>11055</v>
-</b>
-<b>
-<a>7</a>
-<b>21</b>
-<v>9635</v>
-</b>
-<b>
-<a>21</a>
-<b>10073</b>
-<v>6470</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>881958</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>147406</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>112104</v>
-</b>
-<b>
-<a>6</a>
-<b>128414</b>
-<v>76532</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>variable</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>930147</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>113232</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>101472</v>
-</b>
-<b>
-<a>6</a>
-<b>128188</b>
-<v>73150</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1043010</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>84119</v>
-</b>
-<b>
-<a>3</a>
-<b>118352</b>
-<v>90871</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1209135</v>
-</b>
-<b>
-<a>2</a>
-<b>52</b>
-<v>8866</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>var_def</name>
-<cardinality>2408907</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>2408907</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>var_decl_specifiers</name>
-<cardinality>309614</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>309614</v>
-</e>
-<e>
-<k>name</k>
-<v>4</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>309614</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>32</a>
-<b>33</b>
-<v>1</v>
-</b>
-<b>
-<a>38</a>
-<b>39</b>
-<v>1</v>
-</b>
-<b>
-<a>2971</a>
-<b>2972</b>
-<v>1</v>
-</b>
-<b>
-<a>306573</a>
-<b>306574</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>is_structured_binding</name>
-<cardinality>10</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>10</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>type_decls</name>
-<cardinality>1316547</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1316547</v>
-</e>
-<e>
-<k>type_id</k>
-<v>1285169</v>
-</e>
-<e>
-<k>location</k>
-<v>1074107</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1316547</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1316547</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1262343</v>
-</b>
-<b>
-<a>2</a>
-<b>24</b>
-<v>22826</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1263622</v>
-</b>
-<b>
-<a>2</a>
-<b>24</b>
-<v>21547</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1019295</v>
-</b>
-<b>
-<a>2</a>
-<b>506</b>
-<v>54811</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1020758</v>
-</b>
-<b>
-<a>2</a>
-<b>506</b>
-<v>53348</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>type_def</name>
-<cardinality>926754</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>926754</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>type_decl_top</name>
-<cardinality>265548</cardinality>
-<columnsizes>
-<e>
-<k>type_decl</k>
-<v>265548</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>namespace_decls</name>
-<cardinality>135267</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>135267</v>
-</e>
-<e>
-<k>namespace_id</k>
-<v>7587</v>
-</e>
-<e>
-<k>location</k>
-<v>120819</v>
-</e>
-<e>
-<k>bodylocation</k>
-<v>121144</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>namespace_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>135267</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>135267</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>bodylocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>135267</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>namespace_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3576</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1073</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>411</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>639</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>585</v>
-</b>
-<b>
-<a>13</a>
-<b>27</b>
-<v>585</v>
-</b>
-<b>
-<a>28</a>
-<b>163</b>
-<v>574</v>
-</b>
-<b>
-<a>172</a>
-<b>3743</b>
-<v>140</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>namespace_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3576</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1073</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>411</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>639</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>585</v>
-</b>
-<b>
-<a>13</a>
-<b>27</b>
-<v>585</v>
-</b>
-<b>
-<a>28</a>
-<b>163</b>
-<v>574</v>
-</b>
-<b>
-<a>172</a>
-<b>3743</b>
-<v>140</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>namespace_id</src>
-<trg>bodylocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3576</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1073</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>411</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>639</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>585</v>
-</b>
-<b>
-<a>13</a>
-<b>27</b>
-<v>585</v>
-</b>
-<b>
-<a>28</a>
-<b>163</b>
-<v>574</v>
-</b>
-<b>
-<a>172</a>
-<b>3742</b>
-<v>140</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>112538</v>
-</b>
-<b>
-<a>2</a>
-<b>8</b>
-<v>8280</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>namespace_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>112538</v>
-</b>
-<b>
-<a>2</a>
-<b>8</b>
-<v>8280</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>bodylocation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>120082</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>737</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bodylocation</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>113221</v>
-</b>
-<b>
-<a>2</a>
-<b>11</b>
-<v>7923</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bodylocation</src>
-<trg>namespace_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>113221</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>7923</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bodylocation</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>120754</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>390</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>usings</name>
-<cardinality>287692</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>287692</v>
-</e>
-<e>
-<k>element_id</k>
-<v>45522</v>
-</e>
-<e>
-<k>location</k>
-<v>23574</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>element_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>287692</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>287692</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>38596</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>3706</v>
-</b>
-<b>
-<a>4</a>
-<b>127</b>
-<v>3219</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>38596</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>3706</v>
-</b>
-<b>
-<a>4</a>
-<b>127</b>
-<v>3219</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>17851</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2200</v>
-</b>
-<b>
-<a>3</a>
-<b>18</b>
-<v>1777</v>
-</b>
-<b>
-<a>18</a>
-<b>382</b>
-<v>1745</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>element_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>17851</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2200</v>
-</b>
-<b>
-<a>3</a>
-<b>18</b>
-<v>1777</v>
-</b>
-<b>
-<a>18</a>
-<b>382</b>
-<v>1745</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>using_container</name>
-<cardinality>452397</cardinality>
-<columnsizes>
-<e>
-<k>parent</k>
-<v>11022</v>
-</e>
-<e>
-<k>child</k>
-<v>287692</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>parent</src>
-<trg>child</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3154</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>932</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>411</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>2698</v>
-</b>
-<b>
-<a>7</a>
-<b>17</b>
-<v>921</v>
-</b>
-<b>
-<a>19</a>
-<b>143</b>
-<v>758</v>
-</b>
-<b>
-<a>178</a>
-<b>179</b>
-<v>1246</v>
-</b>
-<b>
-<a>179</a>
-<b>202</b>
-<v>834</v>
-</b>
-<b>
-<a>202</a>
-<b>501</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>child</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>212991</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>49782</v>
-</b>
-<b>
-<a>3</a>
-<b>11</b>
-<v>22869</v>
-</b>
-<b>
-<a>13</a>
-<b>47</b>
-<v>2048</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>static_asserts</name>
-<cardinality>130452</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>130452</v>
-</e>
-<e>
-<k>condition</k>
-<v>130452</v>
-</e>
-<e>
-<k>message</k>
-<v>29660</v>
-</e>
-<e>
-<k>location</k>
-<v>16694</v>
-</e>
-<e>
-<k>enclosing</k>
-<v>1721</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>condition</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>enclosing</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>condition</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>condition</src>
-<trg>message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>condition</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>condition</src>
-<trg>enclosing</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130452</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>message</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>22073</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>422</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2825</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>1442</v>
-</b>
-<b>
-<a>12</a>
-<b>17</b>
-<v>2345</v>
-</b>
-<b>
-<a>17</a>
-<b>513</b>
-<v>552</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>message</src>
-<trg>condition</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>22073</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>422</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2825</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>1442</v>
-</b>
-<b>
-<a>12</a>
-<b>17</b>
-<v>2345</v>
-</b>
-<b>
-<a>17</a>
-<b>513</b>
-<v>552</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>message</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>27510</v>
-</b>
-<b>
-<a>2</a>
-<b>33</b>
-<v>2150</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>message</src>
-<trg>enclosing</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>23476</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>181</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2650</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>1299</v>
-</b>
-<b>
-<a>12</a>
-<b>21</b>
-<v>2052</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2897</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2760</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1325</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3722</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>175</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>2033</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>38</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>3397</v>
-</b>
-<b>
-<a>19</a>
-<b>52</b>
-<v>344</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>condition</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2897</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2760</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1325</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3722</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>175</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>2033</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>38</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>3397</v>
-</b>
-<b>
-<a>19</a>
-<b>52</b>
-<v>344</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4410</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5976</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6119</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>188</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>enclosing</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3436</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6184</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1123</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>3709</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>188</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>2033</v>
-</b>
-<b>
-<a>16</a>
-<b>21</b>
-<v>19</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>enclosing</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1169</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>129</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>136</v>
-</b>
-<b>
-<a>9</a>
-<b>108</b>
-<v>136</v>
-</b>
-<b>
-<a>170</a>
-<b>347</b>
-<v>129</v>
-</b>
-<b>
-<a>348</a>
-<b>10697</b>
-<v>19</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>enclosing</src>
-<trg>condition</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1169</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>129</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>136</v>
-</b>
-<b>
-<a>9</a>
-<b>108</b>
-<v>136</v>
-</b>
-<b>
-<a>170</a>
-<b>347</b>
-<v>129</v>
-</b>
-<b>
-<a>348</a>
-<b>10697</b>
-<v>19</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>enclosing</src>
-<trg>message</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1325</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>136</v>
-</b>
-<b>
-<a>5</a>
-<b>180</b>
-<v>129</v>
-</b>
-<b>
-<a>211</a>
-<b>2870</b>
-<v>129</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>enclosing</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1312</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>149</v>
-</b>
-<b>
-<a>5</a>
-<b>180</b>
-<v>129</v>
-</b>
-<b>
-<a>211</a>
-<b>1886</b>
-<v>129</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>params</name>
-<cardinality>4589800</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4572935</v>
-</e>
-<e>
-<k>function</k>
-<v>3007660</v>
-</e>
-<e>
-<k>index</k>
-<v>693</v>
-</e>
-<e>
-<k>type_id</k>
-<v>1834606</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4572273</v>
-</b>
-<b>
-<a>2</a>
-<b>69</b>
-<v>661</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4572935</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4558064</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>14870</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2140887</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>469349</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>241595</v>
-</b>
-<b>
-<a>4</a>
-<b>65</b>
-<v>155828</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2140887</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>469349</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>241595</v>
-</b>
-<b>
-<a>4</a>
-<b>65</b>
-<v>155828</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2255896</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>465458</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>251350</v>
-</b>
-<b>
-<a>5</a>
-<b>20</b>
-<v>34954</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>346</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>140</v>
-</b>
-<b>
-<a>6</a>
-<b>118</b>
-<v>54</v>
-</b>
-<b>
-<a>191</a>
-<b>616</b>
-<v>54</v>
-</b>
-<b>
-<a>884</a>
-<b>5095</b>
-<v>54</v>
-</b>
-<b>
-<a>14377</a>
-<b>277321</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>346</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>140</v>
-</b>
-<b>
-<a>6</a>
-<b>118</b>
-<v>54</v>
-</b>
-<b>
-<a>191</a>
-<b>616</b>
-<v>54</v>
-</b>
-<b>
-<a>884</a>
-<b>5095</b>
-<v>54</v>
-</b>
-<b>
-<a>14377</a>
-<b>277493</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>346</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>140</v>
-</b>
-<b>
-<a>4</a>
-<b>37</b>
-<v>54</v>
-</b>
-<b>
-<a>38</a>
-<b>104</b>
-<v>54</v>
-</b>
-<b>
-<a>171</a>
-<b>1179</b>
-<v>54</v>
-</b>
-<b>
-<a>2870</a>
-<b>151119</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1486737</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>184518</v>
-</b>
-<b>
-<a>3</a>
-<b>14</b>
-<v>137781</v>
-</b>
-<b>
-<a>14</a>
-<b>5175</b>
-<v>25568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>function</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1506355</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>177679</v>
-</b>
-<b>
-<a>3</a>
-<b>23</b>
-<v>138074</v>
-</b>
-<b>
-<a>23</a>
-<b>4690</b>
-<v>12497</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1724311</v>
-</b>
-<b>
-<a>2</a>
-<b>65</b>
-<v>110294</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>overrides</name>
-<cardinality>158806</cardinality>
-<columnsizes>
-<e>
-<k>new</k>
-<v>124352</v>
-</e>
-<e>
-<k>old</k>
-<v>15440</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>new</src>
-<trg>old</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>89904</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>34441</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>old</src>
-<trg>new</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8113</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2013</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>870</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1260</v>
-</b>
-<b>
-<a>5</a>
-<b>10</b>
-<v>1227</v>
-</b>
-<b>
-<a>10</a>
-<b>43</b>
-<v>1162</v>
-</b>
-<b>
-<a>44</a>
-<b>218</b>
-<v>792</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>membervariables</name>
-<cardinality>308142</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>300035</v>
-</e>
-<e>
-<k>type_id</k>
-<v>56417</v>
-</e>
-<e>
-<k>name</k>
-<v>94717</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>292000</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>8035</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>300035</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>40463</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>7041</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>4586</v>
-</b>
-<b>
-<a>6</a>
-<b>423</b>
-<v>4235</v>
-</b>
-<b>
-<a>460</a>
-<b>3062</b>
-<v>90</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>44789</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5326</v>
-</b>
-<b>
-<a>3</a>
-<b>9</b>
-<v>4462</v>
-</b>
-<b>
-<a>9</a>
-<b>1352</b>
-<v>1838</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>63303</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>16272</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>8288</v>
-</b>
-<b>
-<a>5</a>
-<b>1294</b>
-<v>6853</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>75353</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12998</v>
-</b>
-<b>
-<a>3</a>
-<b>421</b>
-<v>6366</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>globalvariables</name>
-<cardinality>301151</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>301143</v>
-</e>
-<e>
-<k>type_id</k>
-<v>1460</v>
-</e>
-<e>
-<k>name</k>
-<v>295146</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>301135</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>301143</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1013</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>167</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>118</v>
-</b>
-<b>
-<a>7</a>
-<b>64</b>
-<v>110</v>
-</b>
-<b>
-<a>66</a>
-<b>169462</b>
-<v>52</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1049</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>141</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>117</v>
-</b>
-<b>
-<a>7</a>
-<b>102</b>
-<v>110</v>
-</b>
-<b>
-<a>105</a>
-<b>168513</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>291383</v>
-</b>
-<b>
-<a>2</a>
-<b>33</b>
-<v>3763</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>294545</v>
-</b>
-<b>
-<a>2</a>
-<b>12</b>
-<v>601</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>localvariables</name>
-<cardinality>520470</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>520392</v>
-</e>
-<e>
-<k>type_id</k>
-<v>47453</v>
-</e>
-<e>
-<k>name</k>
-<v>75119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>520314</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>77</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>520392</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26432</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6749</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2851</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>4053</v>
-</b>
-<b>
-<a>6</a>
-<b>13</b>
-<v>3800</v>
-</b>
-<b>
-<a>13</a>
-<b>3196</b>
-<v>3559</v>
-</b>
-<b>
-<a>4920</a>
-<b>4921</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>35643</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4865</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>4261</v>
-</b>
-<b>
-<a>5</a>
-<b>1158</b>
-<v>2682</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>42892</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12894</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>5079</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>6710</v>
-</b>
-<b>
-<a>7</a>
-<b>31</b>
-<v>5696</v>
-</b>
-<b>
-<a>31</a>
-<b>6112</b>
-<v>1844</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>63634</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6379</v>
-</b>
-<b>
-<a>3</a>
-<b>819</b>
-<v>5105</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>autoderivation</name>
-<cardinality>19481</cardinality>
-<columnsizes>
-<e>
-<k>var</k>
-<v>19481</v>
-</e>
-<e>
-<k>derivation_type</k>
-<v>32</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>var</src>
-<trg>derivation_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>19481</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>derivation_type</src>
-<trg>var</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>20</a>
-<b>21</b>
-<v>6</v>
-</b>
-<b>
-<a>39</a>
-<b>40</b>
-<v>6</v>
-</b>
-<b>
-<a>161</a>
-<b>162</b>
-<v>6</v>
-</b>
-<b>
-<a>475</a>
-<b>476</b>
-<v>6</v>
-</b>
-<b>
-<a>2304</a>
-<b>2305</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>enumconstants</name>
-<cardinality>93691</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>93691</v>
-</e>
-<e>
-<k>parent</k>
-<v>7996</v>
-</e>
-<e>
-<k>index</k>
-<v>7567</v>
-</e>
-<e>
-<k>type_id</k>
-<v>7853</v>
-</e>
-<e>
-<k>name</k>
-<v>72787</v>
-</e>
-<e>
-<k>location</k>
-<v>75749</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>93691</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>93691</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>93691</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>93691</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>93691</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>818</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2448</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>578</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>578</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>727</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>610</v>
-</b>
-<b>
-<a>16</a>
-<b>392</b>
-<v>604</v>
-</b>
-<b>
-<a>426</a>
-<b>1166</b>
-<v>38</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>831</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2494</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>571</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>584</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>701</v>
-</b>
-<b>
-<a>9</a>
-<b>17</b>
-<v>623</v>
-</b>
-<b>
-<a>17</a>
-<b>1166</b>
-<v>597</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7255</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>740</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>831</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2494</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>571</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>584</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>701</v>
-</b>
-<b>
-<a>9</a>
-<b>17</b>
-<v>623</v>
-</b>
-<b>
-<a>17</a>
-<b>1166</b>
-<v>597</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1630</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>831</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2448</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>578</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>558</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>701</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>610</v>
-</b>
-<b>
-<a>16</a>
-<b>427</b>
-<v>604</v>
-</b>
-<b>
-<a>466</a>
-<b>1166</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2604</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>928</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>922</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>571</v>
-</b>
-<b>
-<a>7</a>
-<b>10</b>
-<v>688</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>350</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>552</v>
-</b>
-<b>
-<a>12</a>
-<b>30</b>
-<v>597</v>
-</b>
-<b>
-<a>30</a>
-<b>1253</b>
-<v>350</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2604</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>928</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>922</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>571</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>675</v>
-</b>
-<b>
-<a>9</a>
-<b>11</b>
-<v>363</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>552</v>
-</b>
-<b>
-<a>12</a>
-<b>29</b>
-<v>597</v>
-</b>
-<b>
-<a>29</a>
-<b>1232</b>
-<v>350</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2604</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>928</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>922</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>571</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>675</v>
-</b>
-<b>
-<a>9</a>
-<b>11</b>
-<v>363</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>552</v>
-</b>
-<b>
-<a>12</a>
-<b>28</b>
-<v>597</v>
-</b>
-<b>
-<a>28</a>
-<b>1210</b>
-<v>350</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2604</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>928</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>922</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>571</v>
-</b>
-<b>
-<a>7</a>
-<b>10</b>
-<v>688</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>350</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>552</v>
-</b>
-<b>
-<a>12</a>
-<b>28</b>
-<v>597</v>
-</b>
-<b>
-<a>28</a>
-<b>674</b>
-<v>350</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2604</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>928</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>922</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>571</v>
-</b>
-<b>
-<a>7</a>
-<b>10</b>
-<v>688</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>350</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>552</v>
-</b>
-<b>
-<a>12</a>
-<b>28</b>
-<v>597</v>
-</b>
-<b>
-<a>28</a>
-<b>774</b>
-<v>350</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>799</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2422</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>558</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>558</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>701</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>597</v>
-</b>
-<b>
-<a>16</a>
-<b>470</b>
-<v>591</v>
-</b>
-<b>
-<a>479</a>
-<b>1166</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7847</v>
-</b>
-<b>
-<a>137</a>
-<b>138</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>811</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2468</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>552</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>565</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>675</v>
-</b>
-<b>
-<a>9</a>
-<b>17</b>
-<v>610</v>
-</b>
-<b>
-<a>17</a>
-<b>1166</b>
-<v>578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1591</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>811</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2468</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>552</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>565</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>675</v>
-</b>
-<b>
-<a>9</a>
-<b>17</b>
-<v>610</v>
-</b>
-<b>
-<a>17</a>
-<b>1166</b>
-<v>578</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1630</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>811</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2422</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>558</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>539</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>675</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>597</v>
-</b>
-<b>
-<a>16</a>
-<b>470</b>
-<v>591</v>
-</b>
-<b>
-<a>621</a>
-<b>1166</b>
-<v>25</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65440</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6827</v>
-</b>
-<b>
-<a>3</a>
-<b>239</b>
-<v>519</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>66083</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6184</v>
-</b>
-<b>
-<a>3</a>
-<b>239</b>
-<v>519</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67772</v>
-</b>
-<b>
-<a>2</a>
-<b>13</b>
-<v>5014</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>61049</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>11218</v>
-</b>
-<b>
-<a>3</a>
-<b>239</b>
-<v>519</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>70318</v>
-</b>
-<b>
-<a>2</a>
-<b>23</b>
-<v>2468</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>70468</v>
-</b>
-<b>
-<a>2</a>
-<b>229</b>
-<v>5281</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>70578</v>
-</b>
-<b>
-<a>2</a>
-<b>229</b>
-<v>5170</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>72157</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>3592</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65544</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>9951</v>
-</b>
-<b>
-<a>3</a>
-<b>229</b>
-<v>253</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>75580</v>
-</b>
-<b>
-<a>2</a>
-<b>27</b>
-<v>168</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>builtintypes</name>
-<cardinality>509</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>509</v>
-</e>
-<e>
-<k>name</k>
-<v>509</v>
-</e>
-<e>
-<k>kind</k>
-<v>509</v>
-</e>
-<e>
-<k>size</k>
-<v>75</v>
-</e>
-<e>
-<k>sign</k>
-<v>32</v>
-</e>
-<e>
-<k>alignment</k>
-<v>54</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>sign</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>sign</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>sign</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>509</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>10</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>10</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>10</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>sign</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>54</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>54</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sign</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>29</a>
-<b>30</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sign</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>29</a>
-<b>30</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sign</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>29</a>
-<b>30</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sign</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>5</a>
-<b>6</b>
-<v>21</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sign</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>5</a>
-<b>6</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>sign</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>54</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>derivedtypes</name>
-<cardinality>4408457</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4408457</v>
-</e>
-<e>
-<k>name</k>
-<v>2176199</v>
-</e>
-<e>
-<k>kind</k>
-<v>86</v>
-</e>
-<e>
-<k>type_id</k>
-<v>2578132</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4408457</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4408457</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4408457</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1573891</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>488328</v>
-</b>
-<b>
-<a>3</a>
-<b>45171</b>
-<v>113980</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2176167</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1574130</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>488100</v>
-</b>
-<b>
-<a>3</a>
-<b>45153</b>
-<v>113969</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>21</a>
-<b>22</b>
-<v>10</v>
-</b>
-<b>
-<a>62</a>
-<b>63</b>
-<v>10</v>
-</b>
-<b>
-<a>2069</a>
-<b>2070</b>
-<v>10</v>
-</b>
-<b>
-<a>31133</a>
-<b>31134</b>
-<v>10</v>
-</b>
-<b>
-<a>45223</a>
-<b>45224</b>
-<v>10</v>
-</b>
-<b>
-<a>61016</a>
-<b>61017</b>
-<v>10</v>
-</b>
-<b>
-<a>96858</a>
-<b>96859</b>
-<v>10</v>
-</b>
-<b>
-<a>170348</a>
-<b>170349</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-<b>
-<a>39</a>
-<b>40</b>
-<v>10</v>
-</b>
-<b>
-<a>1155</a>
-<b>1156</b>
-<v>10</v>
-</b>
-<b>
-<a>17432</a>
-<b>17433</b>
-<v>10</v>
-</b>
-<b>
-<a>40934</a>
-<b>40935</b>
-<v>10</v>
-</b>
-<b>
-<a>48321</a>
-<b>48322</b>
-<v>10</v>
-</b>
-<b>
-<a>92888</a>
-<b>92889</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>21</a>
-<b>22</b>
-<v>10</v>
-</b>
-<b>
-<a>983</a>
-<b>984</b>
-<v>10</v>
-</b>
-<b>
-<a>31133</a>
-<b>31134</b>
-<v>10</v>
-</b>
-<b>
-<a>45223</a>
-<b>45224</b>
-<v>10</v>
-</b>
-<b>
-<a>61016</a>
-<b>61017</b>
-<v>10</v>
-</b>
-<b>
-<a>96527</a>
-<b>96528</b>
-<v>10</v>
-</b>
-<b>
-<a>170348</a>
-<b>170349</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1521486</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>365026</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>620527</v>
-</b>
-<b>
-<a>4</a>
-<b>202</b>
-<v>71091</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1522689</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>364874</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>619476</v>
-</b>
-<b>
-<a>4</a>
-<b>198</b>
-<v>71091</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1523003</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>366143</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>619433</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>69552</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>pointerishsize</name>
-<cardinality>3335520</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>3335520</v>
-</e>
-<e>
-<k>size</k>
-<v>21</v>
-</e>
-<e>
-<k>alignment</k>
-<v>10</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3335520</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3335520</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>21</a>
-<b>22</b>
-<v>10</v>
-</b>
-<b>
-<a>307720</a>
-<b>307721</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>307741</a>
-<b>307742</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>arraysizes</name>
-<cardinality>16995</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>16995</v>
-</e>
-<e>
-<k>num_elements</k>
-<v>2135</v>
-</e>
-<e>
-<k>bytesize</k>
-<v>2482</v>
-</e>
-<e>
-<k>alignment</k>
-<v>75</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>num_elements</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>16995</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>bytesize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>16995</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>16995</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_elements</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>162</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1257</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>75</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>173</v>
-</b>
-<b>
-<a>5</a>
-<b>13</b>
-<v>162</v>
-</b>
-<b>
-<a>13</a>
-<b>25</b>
-<v>162</v>
-</b>
-<b>
-<a>38</a>
-<b>116</b>
-<v>140</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_elements</src>
-<trg>bytesize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1571</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>216</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>119</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>162</v>
-</b>
-<b>
-<a>6</a>
-<b>11</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num_elements</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1571</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>238</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>140</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>162</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bytesize</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>151</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1387</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>108</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>205</v>
-</b>
-<b>
-<a>6</a>
-<b>9</b>
-<v>195</v>
-</b>
-<b>
-<a>9</a>
-<b>18</b>
-<v>205</v>
-</b>
-<b>
-<a>21</a>
-<b>56</b>
-<v>195</v>
-</b>
-<b>
-<a>59</a>
-<b>75</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bytesize</src>
-<trg>num_elements</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1885</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>346</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>216</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bytesize</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1929</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>281</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>227</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>18</a>
-<b>19</b>
-<v>21</v>
-</b>
-<b>
-<a>33</a>
-<b>34</b>
-<v>10</v>
-</b>
-<b>
-<a>50</a>
-<b>51</b>
-<v>10</v>
-</b>
-<b>
-<a>181</a>
-<b>182</b>
-<v>10</v>
-</b>
-<b>
-<a>407</a>
-<b>408</b>
-<v>10</v>
-</b>
-<b>
-<a>861</a>
-<b>862</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>num_elements</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>10</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>10</v>
-</b>
-<b>
-<a>39</a>
-<b>40</b>
-<v>10</v>
-</b>
-<b>
-<a>41</a>
-<b>42</b>
-<v>10</v>
-</b>
-<b>
-<a>190</a>
-<b>191</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>bytesize</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>10</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>10</v>
-</b>
-<b>
-<a>41</a>
-<b>42</b>
-<v>10</v>
-</b>
-<b>
-<a>54</a>
-<b>55</b>
-<v>10</v>
-</b>
-<b>
-<a>191</a>
-<b>192</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>typedefbase</name>
-<cardinality>1798090</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1798090</v>
-</e>
-<e>
-<k>type_id</k>
-<v>837313</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1798090</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>648849</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>86937</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>68695</v>
-</b>
-<b>
-<a>6</a>
-<b>5503</b>
-<v>32830</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>decltypes</name>
-<cardinality>46454</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>46454</v>
-</e>
-<e>
-<k>expr</k>
-<v>42932</v>
-</e>
-<e>
-<k>base_type</k>
-<v>8530</v>
-</e>
-<e>
-<k>parentheses_would_change_meaning</k>
-<v>21</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>46454</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>base_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>46454</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>parentheses_would_change_meaning</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>46454</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>39691</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>3240</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>base_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>39691</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>3240</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>parentheses_would_change_meaning</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>42932</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>base_type</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5755</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2492</v>
-</b>
-<b>
-<a>3</a>
-<b>274</b>
-<v>281</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>base_type</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2286</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5636</v>
-</b>
-<b>
-<a>3</a>
-<b>2451</b>
-<v>606</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>base_type</src>
-<trg>parentheses_would_change_meaning</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8530</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentheses_would_change_meaning</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>1356</a>
-<b>1357</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentheses_would_change_meaning</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>3953</a>
-<b>3954</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentheses_would_change_meaning</src>
-<trg>base_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>779</a>
-<b>780</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>usertypes</name>
-<cardinality>4144306</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4144306</v>
-</e>
-<e>
-<k>name</k>
-<v>868886</v>
-</e>
-<e>
-<k>kind</k>
-<v>119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4144306</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4144306</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>570463</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>192539</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>68500</v>
-</b>
-<b>
-<a>7</a>
-<b>32725</b>
-<v>37382</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>816860</v>
-</b>
-<b>
-<a>2</a>
-<b>10</b>
-<v>52025</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>23</a>
-<b>24</b>
-<v>10</v>
-</b>
-<b>
-<a>372</a>
-<b>373</b>
-<v>10</v>
-</b>
-<b>
-<a>776</a>
-<b>777</b>
-<v>10</v>
-</b>
-<b>
-<a>1938</a>
-<b>1939</b>
-<v>10</v>
-</b>
-<b>
-<a>4229</a>
-<b>4230</b>
-<v>10</v>
-</b>
-<b>
-<a>16782</a>
-<b>16783</b>
-<v>10</v>
-</b>
-<b>
-<a>17797</a>
-<b>17798</b>
-<v>10</v>
-</b>
-<b>
-<a>20548</a>
-<b>20549</b>
-<v>10</v>
-</b>
-<b>
-<a>75592</a>
-<b>75593</b>
-<v>10</v>
-</b>
-<b>
-<a>95191</a>
-<b>95192</b>
-<v>10</v>
-</b>
-<b>
-<a>149113</a>
-<b>149114</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>16</a>
-<b>17</b>
-<v>10</v>
-</b>
-<b>
-<a>38</a>
-<b>39</b>
-<v>21</v>
-</b>
-<b>
-<a>418</a>
-<b>419</b>
-<v>10</v>
-</b>
-<b>
-<a>560</a>
-<b>561</b>
-<v>10</v>
-</b>
-<b>
-<a>780</a>
-<b>781</b>
-<v>10</v>
-</b>
-<b>
-<a>2853</a>
-<b>2854</b>
-<v>10</v>
-</b>
-<b>
-<a>4550</a>
-<b>4551</b>
-<v>10</v>
-</b>
-<b>
-<a>9138</a>
-<b>9139</b>
-<v>10</v>
-</b>
-<b>
-<a>11663</a>
-<b>11664</b>
-<v>10</v>
-</b>
-<b>
-<a>55440</a>
-<b>55441</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>usertypesize</name>
-<cardinality>1370156</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1370156</v>
-</e>
-<e>
-<k>size</k>
-<v>1463</v>
-</e>
-<e>
-<k>alignment</k>
-<v>86</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1370156</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1370156</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>422</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>195</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>65</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>86</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>119</v>
-</b>
-<b>
-<a>8</a>
-<b>12</b>
-<v>108</v>
-</b>
-<b>
-<a>12</a>
-<b>17</b>
-<v>119</v>
-</b>
-<b>
-<a>19</a>
-<b>38</b>
-<v>119</v>
-</b>
-<b>
-<a>42</a>
-<b>261</b>
-<v>119</v>
-</b>
-<b>
-<a>284</a>
-<b>99362</b>
-<v>108</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>size</src>
-<trg>alignment</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1203</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>173</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>86</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>50</a>
-<b>51</b>
-<v>10</v>
-</b>
-<b>
-<a>54</a>
-<b>55</b>
-<v>10</v>
-</b>
-<b>
-<a>2327</a>
-<b>2328</b>
-<v>10</v>
-</b>
-<b>
-<a>10108</a>
-<b>10109</b>
-<v>10</v>
-</b>
-<b>
-<a>113863</a>
-<b>113864</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>alignment</src>
-<trg>size</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>10</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>10</v>
-</b>
-<b>
-<a>25</a>
-<b>26</b>
-<v>10</v>
-</b>
-<b>
-<a>106</a>
-<b>107</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>usertype_final</name>
-<cardinality>1312</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1312</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>usertype_uuid</name>
-<cardinality>4826</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4826</v>
-</e>
-<e>
-<k>uuid</k>
-<v>4826</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>uuid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4826</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>uuid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4826</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>mangled_name</name>
-<cardinality>4141065</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4141065</v>
-</e>
-<e>
-<k>mangled_name</k>
-<v>478020</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>mangled_name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4141065</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>mangled_name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>288667</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>61563</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>32949</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>36537</v>
-</b>
-<b>
-<a>7</a>
-<b>24</b>
-<v>36634</v>
-</b>
-<b>
-<a>24</a>
-<b>8580</b>
-<v>21666</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>is_pod_class</name>
-<cardinality>582213</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>582213</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>is_standard_layout_class</name>
-<cardinality>1145425</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1145425</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>is_complete</name>
-<cardinality>1348901</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1348901</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>is_class_template</name>
-<cardinality>222714</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>222714</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>class_instantiation</name>
-<cardinality>1144049</cardinality>
-<columnsizes>
-<e>
-<k>to</k>
-<v>1142499</v>
-</e>
-<e>
-<k>from</k>
-<v>67232</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>to</src>
-<trg>from</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1141036</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>1463</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>from</src>
-<trg>to</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>19726</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>11857</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6774</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>4563</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>5571</v>
-</b>
-<b>
-<a>7</a>
-<b>11</b>
-<v>5982</v>
-</b>
-<b>
-<a>11</a>
-<b>20</b>
-<v>5137</v>
-</b>
-<b>
-<a>20</a>
-<b>84</b>
-<v>5050</v>
-</b>
-<b>
-<a>84</a>
-<b>4845</b>
-<v>2568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>class_template_argument</name>
-<cardinality>3000322</cardinality>
-<columnsizes>
-<e>
-<k>type_id</k>
-<v>1376323</v>
-</e>
-<e>
-<k>index</k>
-<v>1213</v>
-</e>
-<e>
-<k>arg_type</k>
-<v>850742</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>type_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>560264</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>428660</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>242126</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>121372</v>
-</b>
-<b>
-<a>7</a>
-<b>113</b>
-<v>23899</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>arg_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>586190</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>440746</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>255425</v>
-</b>
-<b>
-<a>4</a>
-<b>113</b>
-<v>93960</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>769</v>
-</b>
-<b>
-<a>3</a>
-<b>26</b>
-<v>97</v>
-</b>
-<b>
-<a>29</a>
-<b>64</b>
-<v>97</v>
-</b>
-<b>
-<a>69</a>
-<b>435</b>
-<v>97</v>
-</b>
-<b>
-<a>616</a>
-<b>9358</b>
-<v>97</v>
-</b>
-<b>
-<a>13712</a>
-<b>123907</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>arg_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>769</v>
-</b>
-<b>
-<a>3</a>
-<b>14</b>
-<v>108</v>
-</b>
-<b>
-<a>14</a>
-<b>26</b>
-<v>97</v>
-</b>
-<b>
-<a>29</a>
-<b>148</b>
-<v>97</v>
-</b>
-<b>
-<a>198</a>
-<b>3602</b>
-<v>97</v>
-</b>
-<b>
-<a>11971</a>
-<b>41372</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_type</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>516183</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>185136</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>56047</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>66603</v>
-</b>
-<b>
-<a>11</a>
-<b>11852</b>
-<v>26771</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_type</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>737629</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>94426</v>
-</b>
-<b>
-<a>3</a>
-<b>22</b>
-<v>18685</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>class_template_argument_value</name>
-<cardinality>342536</cardinality>
-<columnsizes>
-<e>
-<k>type_id</k>
-<v>221229</v>
-</e>
-<e>
-<k>index</k>
-<v>151</v>
-</e>
-<e>
-<k>arg_value</k>
-<v>325172</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>type_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>199129</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>13548</v>
-</b>
-<b>
-<a>3</a>
-<b>14</b>
-<v>8551</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>arg_value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>187640</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>16724</v>
-</b>
-<b>
-<a>3</a>
-<b>37</b>
-<v>16594</v>
-</b>
-<b>
-<a>44</a>
-<b>171</b>
-<v>270</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>54</v>
-</b>
-<b>
-<a>20</a>
-<b>21</b>
-<v>10</v>
-</b>
-<b>
-<a>25</a>
-<b>26</b>
-<v>10</v>
-</b>
-<b>
-<a>206</a>
-<b>207</b>
-<v>10</v>
-</b>
-<b>
-<a>389</a>
-<b>390</b>
-<v>10</v>
-</b>
-<b>
-<a>552</a>
-<b>553</b>
-<v>10</v>
-</b>
-<b>
-<a>1310</a>
-<b>1311</b>
-<v>10</v>
-</b>
-<b>
-<a>5430</a>
-<b>5431</b>
-<v>10</v>
-</b>
-<b>
-<a>5675</a>
-<b>5676</b>
-<v>10</v>
-</b>
-<b>
-<a>9813</a>
-<b>9814</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>arg_value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>54</v>
-</b>
-<b>
-<a>20</a>
-<b>21</b>
-<v>10</v>
-</b>
-<b>
-<a>42</a>
-<b>43</b>
-<v>10</v>
-</b>
-<b>
-<a>311</a>
-<b>312</b>
-<v>10</v>
-</b>
-<b>
-<a>514</a>
-<b>515</b>
-<v>10</v>
-</b>
-<b>
-<a>715</a>
-<b>716</b>
-<v>10</v>
-</b>
-<b>
-<a>1597</a>
-<b>1598</b>
-<v>10</v>
-</b>
-<b>
-<a>6347</a>
-<b>6348</b>
-<v>10</v>
-</b>
-<b>
-<a>8321</a>
-<b>8322</b>
-<v>10</v>
-</b>
-<b>
-<a>12094</a>
-<b>12095</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_value</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>308123</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>17049</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_value</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>325172</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>is_proxy_class_for</name>
-<cardinality>45836</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>45836</v>
-</e>
-<e>
-<k>templ_param_id</k>
-<v>45836</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>templ_param_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>45836</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>templ_param_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>45836</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>type_mentions</name>
-<cardinality>1674881</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1674881</v>
-</e>
-<e>
-<k>type_id</k>
-<v>67096</v>
-</e>
-<e>
-<k>location</k>
-<v>1644422</v>
-</e>
-<e>
-<k>kind</k>
-<v>12</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1674881</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1674881</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1674881</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30024</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12283</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>3631</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>6054</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>5138</v>
-</b>
-<b>
-<a>13</a>
-<b>35</b>
-<v>5183</v>
-</b>
-<b>
-<a>35</a>
-<b>9490</b>
-<v>4781</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30024</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12283</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>3631</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>6054</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>5138</v>
-</b>
-<b>
-<a>13</a>
-<b>35</b>
-<v>5183</v>
-</b>
-<b>
-<a>35</a>
-<b>9490</b>
-<v>4781</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65856</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1240</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1614300</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>30121</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1614300</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>30121</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1644422</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>685</a>
-<b>686</b>
-<v>6</v>
-</b>
-<b>
-<a>257149</a>
-<b>257150</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>207</a>
-<b>208</b>
-<v>6</v>
-</b>
-<b>
-<a>10313</a>
-<b>10314</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>677</a>
-<b>678</b>
-<v>6</v>
-</b>
-<b>
-<a>252468</a>
-<b>252469</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>is_function_template</name>
-<cardinality>972255</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>972255</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>function_instantiation</name>
-<cardinality>700030</cardinality>
-<columnsizes>
-<e>
-<k>to</k>
-<v>700030</v>
-</e>
-<e>
-<k>from</k>
-<v>127821</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>to</src>
-<trg>from</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>700030</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>from</src>
-<trg>to</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>60295</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>30478</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>7261</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>8714</v>
-</b>
-<b>
-<a>5</a>
-<b>10</b>
-<v>9884</v>
-</b>
-<b>
-<a>10</a>
-<b>71</b>
-<v>9592</v>
-</b>
-<b>
-<a>71</a>
-<b>653</b>
-<v>1593</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>function_template_argument</name>
-<cardinality>1888193</cardinality>
-<columnsizes>
-<e>
-<k>function_id</k>
-<v>1042035</v>
-</e>
-<e>
-<k>index</k>
-<v>216</v>
-</e>
-<e>
-<k>arg_type</k>
-<v>334493</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>function_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>576761</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>287605</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>126271</v>
-</b>
-<b>
-<a>4</a>
-<b>21</b>
-<v>51397</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function_id</src>
-<trg>arg_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>591014</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>285318</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>109644</v>
-</b>
-<b>
-<a>4</a>
-<b>21</b>
-<v>56057</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>function_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>10</v>
-</b>
-<b>
-<a>39</a>
-<b>40</b>
-<v>10</v>
-</b>
-<b>
-<a>65</a>
-<b>66</b>
-<v>10</v>
-</b>
-<b>
-<a>152</a>
-<b>153</b>
-<v>10</v>
-</b>
-<b>
-<a>241</a>
-<b>242</b>
-<v>10</v>
-</b>
-<b>
-<a>328</a>
-<b>329</b>
-<v>10</v>
-</b>
-<b>
-<a>425</a>
-<b>426</b>
-<v>10</v>
-</b>
-<b>
-<a>523</a>
-<b>524</b>
-<v>10</v>
-</b>
-<b>
-<a>758</a>
-<b>759</b>
-<v>10</v>
-</b>
-<b>
-<a>1011</a>
-<b>1012</b>
-<v>10</v>
-</b>
-<b>
-<a>1520</a>
-<b>1521</b>
-<v>10</v>
-</b>
-<b>
-<a>1705</a>
-<b>1706</b>
-<v>10</v>
-</b>
-<b>
-<a>2571</a>
-<b>2572</b>
-<v>10</v>
-</b>
-<b>
-<a>2915</a>
-<b>2916</b>
-<v>10</v>
-</b>
-<b>
-<a>5729</a>
-<b>5730</b>
-<v>10</v>
-</b>
-<b>
-<a>18257</a>
-<b>18258</b>
-<v>10</v>
-</b>
-<b>
-<a>44058</a>
-<b>44059</b>
-<v>10</v>
-</b>
-<b>
-<a>90976</a>
-<b>90977</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>arg_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>10</v>
-</b>
-<b>
-<a>22</a>
-<b>23</b>
-<v>10</v>
-</b>
-<b>
-<a>32</a>
-<b>33</b>
-<v>10</v>
-</b>
-<b>
-<a>54</a>
-<b>55</b>
-<v>10</v>
-</b>
-<b>
-<a>60</a>
-<b>61</b>
-<v>10</v>
-</b>
-<b>
-<a>62</a>
-<b>63</b>
-<v>10</v>
-</b>
-<b>
-<a>78</a>
-<b>79</b>
-<v>10</v>
-</b>
-<b>
-<a>91</a>
-<b>92</b>
-<v>10</v>
-</b>
-<b>
-<a>140</a>
-<b>141</b>
-<v>10</v>
-</b>
-<b>
-<a>214</a>
-<b>215</b>
-<v>10</v>
-</b>
-<b>
-<a>242</a>
-<b>243</b>
-<v>10</v>
-</b>
-<b>
-<a>317</a>
-<b>318</b>
-<v>10</v>
-</b>
-<b>
-<a>521</a>
-<b>522</b>
-<v>10</v>
-</b>
-<b>
-<a>694</a>
-<b>695</b>
-<v>10</v>
-</b>
-<b>
-<a>1488</a>
-<b>1489</b>
-<v>10</v>
-</b>
-<b>
-<a>3726</a>
-<b>3727</b>
-<v>10</v>
-</b>
-<b>
-<a>8711</a>
-<b>8712</b>
-<v>10</v>
-</b>
-<b>
-<a>17522</a>
-<b>17523</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_type</src>
-<trg>function_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>223483</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>44590</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>27346</v>
-</b>
-<b>
-<a>6</a>
-<b>19</b>
-<v>25308</v>
-</b>
-<b>
-<a>19</a>
-<b>2030</b>
-<v>13765</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_type</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>311147</v>
-</b>
-<b>
-<a>2</a>
-<b>12</b>
-<v>23346</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>function_template_argument_value</name>
-<cardinality>197655</cardinality>
-<columnsizes>
-<e>
-<k>function_id</k>
-<v>105829</v>
-</e>
-<e>
-<k>index</k>
-<v>151</v>
-</e>
-<e>
-<k>arg_value</k>
-<v>170363</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>function_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>100377</v>
-</b>
-<b>
-<a>2</a>
-<b>14</b>
-<v>5451</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>function_id</src>
-<trg>arg_value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>83967</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>15987</v>
-</b>
-<b>
-<a>3</a>
-<b>119</b>
-<v>5874</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>function_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>65</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>111</a>
-<b>112</b>
-<v>10</v>
-</b>
-<b>
-<a>445</a>
-<b>446</b>
-<v>10</v>
-</b>
-<b>
-<a>861</a>
-<b>862</b>
-<v>10</v>
-</b>
-<b>
-<a>2152</a>
-<b>2153</b>
-<v>10</v>
-</b>
-<b>
-<a>2453</a>
-<b>2454</b>
-<v>10</v>
-</b>
-<b>
-<a>4262</a>
-<b>4263</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>arg_value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>5</a>
-<b>6</b>
-<v>65</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>169</a>
-<b>170</b>
-<v>10</v>
-</b>
-<b>
-<a>408</a>
-<b>409</b>
-<v>10</v>
-</b>
-<b>
-<a>1024</a>
-<b>1025</b>
-<v>10</v>
-</b>
-<b>
-<a>2547</a>
-<b>2548</b>
-<v>10</v>
-</b>
-<b>
-<a>4912</a>
-<b>4913</b>
-<v>10</v>
-</b>
-<b>
-<a>6613</a>
-<b>6614</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_value</src>
-<trg>function_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>143569</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>26294</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>498</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_value</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>170363</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>is_variable_template</name>
-<cardinality>17602</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>17602</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>variable_instantiation</name>
-<cardinality>35388</cardinality>
-<columnsizes>
-<e>
-<k>to</k>
-<v>35388</v>
-</e>
-<e>
-<k>from</k>
-<v>6394</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>to</src>
-<trg>from</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>35388</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>from</src>
-<trg>to</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2211</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1885</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>357</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>726</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>531</v>
-</b>
-<b>
-<a>9</a>
-<b>21</b>
-<v>487</v>
-</b>
-<b>
-<a>24</a>
-<b>288</b>
-<v>195</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>variable_template_argument</name>
-<cardinality>5476</cardinality>
-<columnsizes>
-<e>
-<k>variable_id</k>
-<v>844</v>
-</e>
-<e>
-<k>index</k>
-<v>32</v>
-</e>
-<e>
-<k>arg_type</k>
-<v>4196</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>variable_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>682</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>123</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>38</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>variable_id</src>
-<trg>arg_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>370</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>129</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>64</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>71</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>71</v>
-</b>
-<b>
-<a>8</a>
-<b>13</b>
-<v>64</v>
-</b>
-<b>
-<a>13</a>
-<b>85</b>
-<v>64</v>
-</b>
-<b>
-<a>202</a>
-<b>203</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>variable_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>6</v>
-</b>
-<b>
-<a>20</a>
-<b>21</b>
-<v>6</v>
-</b>
-<b>
-<a>125</a>
-<b>126</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>arg_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>21</a>
-<b>22</b>
-<v>6</v>
-</b>
-<b>
-<a>83</a>
-<b>84</b>
-<v>6</v>
-</b>
-<b>
-<a>115</a>
-<b>116</b>
-<v>6</v>
-</b>
-<b>
-<a>139</a>
-<b>140</b>
-<v>6</v>
-</b>
-<b>
-<a>322</a>
-<b>323</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_type</src>
-<trg>variable_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3475</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>474</v>
-</b>
-<b>
-<a>3</a>
-<b>11</b>
-<v>246</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_type</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3982</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>214</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>variable_template_argument_value</name>
-<cardinality>136</cardinality>
-<columnsizes>
-<e>
-<k>variable_id</k>
-<v>19</v>
-</e>
-<e>
-<k>index</k>
-<v>12</v>
-</e>
-<e>
-<k>arg_value</k>
-<v>136</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>variable_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>variable_id</src>
-<trg>arg_value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>12</v>
-</b>
-<b>
-<a>15</a>
-<b>16</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>variable_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>arg_value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6</v>
-</b>
-<b>
-<a>15</a>
-<b>16</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_value</src>
-<trg>variable_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>136</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>arg_value</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>136</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>routinetypes</name>
-<cardinality>421539</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>421539</v>
-</e>
-<e>
-<k>return_type</k>
-<v>173397</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>return_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>421539</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>return_type</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>139917</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17580</v>
-</b>
-<b>
-<a>3</a>
-<b>10</b>
-<v>13342</v>
-</b>
-<b>
-<a>10</a>
-<b>8267</b>
-<v>2557</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>routinetypeargs</name>
-<cardinality>704387</cardinality>
-<columnsizes>
-<e>
-<k>routine</k>
-<v>344519</v>
-</e>
-<e>
-<k>index</k>
-<v>346</v>
-</e>
-<e>
-<k>type_id</k>
-<v>202391</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>routine</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>158418</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>94112</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>53066</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>31421</v>
-</b>
-<b>
-<a>6</a>
-<b>33</b>
-<v>7500</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>routine</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>182632</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>94925</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>46563</v>
-</b>
-<b>
-<a>4</a>
-<b>22</b>
-<v>20398</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>routine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>21</v>
-</b>
-<b>
-<a>10</a>
-<b>16</b>
-<v>21</v>
-</b>
-<b>
-<a>19</a>
-<b>33</b>
-<v>21</v>
-</b>
-<b>
-<a>51</a>
-<b>72</b>
-<v>21</v>
-</b>
-<b>
-<a>90</a>
-<b>111</b>
-<v>21</v>
-</b>
-<b>
-<a>134</a>
-<b>193</b>
-<v>21</v>
-</b>
-<b>
-<a>262</a>
-<b>356</b>
-<v>21</v>
-</b>
-<b>
-<a>464</a>
-<b>693</b>
-<v>21</v>
-</b>
-<b>
-<a>1438</a>
-<b>3592</b>
-<v>21</v>
-</b>
-<b>
-<a>8487</a>
-<b>17171</b>
-<v>21</v>
-</b>
-<b>
-<a>31786</a>
-<b>31787</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>21</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>21</v>
-</b>
-<b>
-<a>11</a>
-<b>22</b>
-<v>21</v>
-</b>
-<b>
-<a>32</a>
-<b>36</b>
-<v>21</v>
-</b>
-<b>
-<a>37</a>
-<b>41</b>
-<v>21</v>
-</b>
-<b>
-<a>43</a>
-<b>82</b>
-<v>21</v>
-</b>
-<b>
-<a>124</a>
-<b>183</b>
-<v>21</v>
-</b>
-<b>
-<a>248</a>
-<b>346</b>
-<v>21</v>
-</b>
-<b>
-<a>466</a>
-<b>1095</b>
-<v>21</v>
-</b>
-<b>
-<a>2669</a>
-<b>6025</b>
-<v>21</v>
-</b>
-<b>
-<a>13431</a>
-<b>13432</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>routine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>120526</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>40265</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>12963</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>16420</v>
-</b>
-<b>
-<a>7</a>
-<b>1325</b>
-<v>12215</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>151709</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>38835</v>
-</b>
-<b>
-<a>3</a>
-<b>33</b>
-<v>11846</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>ptrtomembers</name>
-<cardinality>12486</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>12486</v>
-</e>
-<e>
-<k>type_id</k>
-<v>9288</v>
-</e>
-<e>
-<k>class_id</k>
-<v>6286</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12486</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>class_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12486</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8931</v>
-</b>
-<b>
-<a>2</a>
-<b>111</b>
-<v>357</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>class_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8931</v>
-</b>
-<b>
-<a>2</a>
-<b>111</b>
-<v>357</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>class_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5278</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>509</v>
-</b>
-<b>
-<a>8</a>
-<b>65</b>
-<v>498</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>class_id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5278</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>509</v>
-</b>
-<b>
-<a>8</a>
-<b>65</b>
-<v>498</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>specifiers</name>
-<cardinality>498</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>498</v>
-</e>
-<e>
-<k>str</k>
-<v>498</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>str</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>498</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>str</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>498</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>typespecifiers</name>
-<cardinality>1316038</cardinality>
-<columnsizes>
-<e>
-<k>type_id</k>
-<v>1309231</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>75</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>type_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1302424</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6806</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>102</a>
-<b>103</b>
-<v>10</v>
-</b>
-<b>
-<a>222</a>
-<b>223</b>
-<v>10</v>
-</b>
-<b>
-<a>598</a>
-<b>599</b>
-<v>10</v>
-</b>
-<b>
-<a>957</a>
-<b>958</b>
-<v>10</v>
-</b>
-<b>
-<a>2363</a>
-<b>2364</b>
-<v>10</v>
-</b>
-<b>
-<a>20785</a>
-<b>20786</b>
-<v>10</v>
-</b>
-<b>
-<a>96393</a>
-<b>96394</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>funspecifiers</name>
-<cardinality>11898581</cardinality>
-<columnsizes>
-<e>
-<k>func_id</k>
-<v>3610802</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>173</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>func_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>332055</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>428379</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>865569</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1867415</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>117383</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>func_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>50</a>
-<b>51</b>
-<v>10</v>
-</b>
-<b>
-<a>181</a>
-<b>182</b>
-<v>10</v>
-</b>
-<b>
-<a>491</a>
-<b>492</b>
-<v>10</v>
-</b>
-<b>
-<a>592</a>
-<b>593</b>
-<v>10</v>
-</b>
-<b>
-<a>662</a>
-<b>663</b>
-<v>10</v>
-</b>
-<b>
-<a>5721</a>
-<b>5722</b>
-<v>10</v>
-</b>
-<b>
-<a>9634</a>
-<b>9635</b>
-<v>10</v>
-</b>
-<b>
-<a>10714</a>
-<b>10715</b>
-<v>10</v>
-</b>
-<b>
-<a>12941</a>
-<b>12942</b>
-<v>10</v>
-</b>
-<b>
-<a>15383</a>
-<b>15384</b>
-<v>10</v>
-</b>
-<b>
-<a>28391</a>
-<b>28392</b>
-<v>10</v>
-</b>
-<b>
-<a>34167</a>
-<b>34168</b>
-<v>10</v>
-</b>
-<b>
-<a>160563</a>
-<b>160564</b>
-<v>10</v>
-</b>
-<b>
-<a>240969</a>
-<b>240970</b>
-<v>10</v>
-</b>
-<b>
-<a>271992</a>
-<b>271993</b>
-<v>10</v>
-</b>
-<b>
-<a>305333</a>
-<b>305334</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>varspecifiers</name>
-<cardinality>1110252</cardinality>
-<columnsizes>
-<e>
-<k>var_id</k>
-<v>923337</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>64</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>var_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>784946</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>91515</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>46874</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>var_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>17</a>
-<b>18</b>
-<v>6</v>
-</b>
-<b>
-<a>160</a>
-<b>161</b>
-<v>6</v>
-</b>
-<b>
-<a>446</a>
-<b>447</b>
-<v>6</v>
-</b>
-<b>
-<a>5881</a>
-<b>5882</b>
-<v>6</v>
-</b>
-<b>
-<a>8410</a>
-<b>8411</b>
-<v>6</v>
-</b>
-<b>
-<a>8752</a>
-<b>8753</b>
-<v>6</v>
-</b>
-<b>
-<a>11326</a>
-<b>11327</b>
-<v>6</v>
-</b>
-<b>
-<a>13439</a>
-<b>13440</b>
-<v>6</v>
-</b>
-<b>
-<a>42420</a>
-<b>42421</b>
-<v>6</v>
-</b>
-<b>
-<a>80063</a>
-<b>80064</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>attributes</name>
-<cardinality>414234</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>414234</v>
-</e>
-<e>
-<k>kind</k>
-<v>1</v>
-</e>
-<e>
-<k>name</k>
-<v>55</v>
-</e>
-<e>
-<k>name_space</k>
-<v>1</v>
-</e>
-<e>
-<k>location</k>
-<v>90620</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>414234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>414234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name_space</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>414234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>414234</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>254158</a>
-<b>254159</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>34</a>
-<b>35</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>name_space</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>55601</a>
-<b>55602</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>3</v>
-</b>
-<b>
-<a>6</a>
-<b>10</b>
-<v>4</v>
-</b>
-<b>
-<a>25</a>
-<b>42</b>
-<v>4</v>
-</b>
-<b>
-<a>46</a>
-<b>61</b>
-<v>4</v>
-</b>
-<b>
-<a>75</a>
-<b>164</b>
-<v>4</v>
-</b>
-<b>
-<a>225</a>
-<b>444</b>
-<v>4</v>
-</b>
-<b>
-<a>648</a>
-<b>780</b>
-<v>4</v>
-</b>
-<b>
-<a>807</a>
-<b>1148</b>
-<v>4</v>
-</b>
-<b>
-<a>3562</a>
-<b>12538</b>
-<v>4</v>
-</b>
-<b>
-<a>26224</a>
-<b>35247</b>
-<v>4</v>
-</b>
-<b>
-<a>41457</a>
-<b>49796</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>55</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>name_space</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>55</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>4</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>4</v>
-</b>
-<b>
-<a>9</a>
-<b>26</b>
-<v>4</v>
-</b>
-<b>
-<a>32</a>
-<b>50</b>
-<v>4</v>
-</b>
-<b>
-<a>58</a>
-<b>75</b>
-<v>4</v>
-</b>
-<b>
-<a>151</a>
-<b>235</b>
-<v>4</v>
-</b>
-<b>
-<a>440</a>
-<b>628</b>
-<v>4</v>
-</b>
-<b>
-<a>645</a>
-<b>776</b>
-<v>4</v>
-</b>
-<b>
-<a>818</a>
-<b>3958</b>
-<v>4</v>
-</b>
-<b>
-<a>11143</a>
-<b>16981</b>
-<v>4</v>
-</b>
-<b>
-<a>19805</a>
-<b>21504</b>
-<v>4</v>
-</b>
-<b>
-<a>22415</a>
-<b>22416</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name_space</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>254158</a>
-<b>254159</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name_space</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name_space</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>34</a>
-<b>35</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name_space</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>55601</a>
-<b>55602</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26763</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5319</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>30032</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>7396</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>17719</v>
-</b>
-<b>
-<a>9</a>
-<b>73</b>
-<v>3388</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>90620</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>28450</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4685</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>49730</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>7373</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>379</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>name_space</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>90620</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>attribute_args</name>
-<cardinality>152801</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>152801</v>
-</e>
-<e>
-<k>kind</k>
-<v>3</v>
-</e>
-<e>
-<k>attribute</k>
-<v>151500</v>
-</e>
-<e>
-<k>index</k>
-<v>6</v>
-</e>
-<e>
-<k>location</k>
-<v>57431</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>152801</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>attribute</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>152801</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>152801</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>152801</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3879</a>
-<b>3880</b>
-<v>1</v>
-</b>
-<b>
-<a>89859</a>
-<b>89860</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>attribute</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3879</a>
-<b>3880</b>
-<v>1</v>
-</b>
-<b>
-<a>89377</a>
-<b>89378</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3807</a>
-<b>3808</b>
-<v>1</v>
-</b>
-<b>
-<a>34991</a>
-<b>34992</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>attribute</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>150721</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>779</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>attribute</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>151010</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>490</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>attribute</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>150721</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>779</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>attribute</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>150726</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>774</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-<b>
-<a>319</a>
-<b>320</b>
-<v>1</v>
-</b>
-<b>
-<a>478</a>
-<b>479</b>
-<v>1</v>
-</b>
-<b>
-<a>92940</a>
-<b>92941</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>attribute</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-<b>
-<a>319</a>
-<b>320</b>
-<v>1</v>
-</b>
-<b>
-<a>478</a>
-<b>479</b>
-<v>1</v>
-</b>
-<b>
-<a>92955</a>
-<b>92956</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-<b>
-<a>252</a>
-<b>253</b>
-<v>1</v>
-</b>
-<b>
-<a>410</a>
-<b>411</b>
-<v>1</v>
-</b>
-<b>
-<a>34581</a>
-<b>34582</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>27328</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8439</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>2889</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>17621</v>
-</b>
-<b>
-<a>6</a>
-<b>37</b>
-<v>1152</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>51629</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5802</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>attribute</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>27314</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8455</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>2888</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>17621</v>
-</b>
-<b>
-<a>6</a>
-<b>37</b>
-<v>1152</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>57427</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>attribute_arg_value</name>
-<cardinality>152776</cardinality>
-<columnsizes>
-<e>
-<k>arg</k>
-<v>152776</v>
-</e>
-<e>
-<k>value</k>
-<v>2190</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>arg</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>152776</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>arg</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1732</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>156</v>
-</b>
-<b>
-<a>3</a>
-<b>10</b>
-<v>167</v>
-</b>
-<b>
-<a>10</a>
-<b>23976</b>
-<v>133</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>attribute_arg_type</name>
-<cardinality>54</cardinality>
-<columnsizes>
-<e>
-<k>arg</k>
-<v>54</v>
-</e>
-<e>
-<k>type_id</k>
-<v>32</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>arg</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>54</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>arg</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>attribute_arg_name</name>
-<cardinality>6</cardinality>
-<columnsizes>
-<e>
-<k>arg</k>
-<v>6</v>
-</e>
-<e>
-<k>name</k>
-<v>5</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>arg</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>arg</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>typeattributes</name>
-<cardinality>19097</cardinality>
-<columnsizes>
-<e>
-<k>type_id</k>
-<v>17732</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>19097</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>type_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>17038</v>
-</b>
-<b>
-<a>2</a>
-<b>34</b>
-<v>693</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>19097</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>funcattributes</name>
-<cardinality>300785</cardinality>
-<columnsizes>
-<e>
-<k>func_id</k>
-<v>162277</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>300785</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>func_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>88595</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12432</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>59266</v>
-</b>
-<b>
-<a>4</a>
-<b>14</b>
-<v>1983</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>func_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>300785</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>varattributes</name>
-<cardinality>371223</cardinality>
-<columnsizes>
-<e>
-<k>var_id</k>
-<v>322421</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>371223</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>var_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>273655</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>48763</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>3</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>var_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>371223</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>stmtattributes</name>
-<cardinality>986</cardinality>
-<columnsizes>
-<e>
-<k>stmt_id</k>
-<v>986</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>986</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>stmt_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>986</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>stmt_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>986</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>unspecifiedtype</name>
-<cardinality>9002061</cardinality>
-<columnsizes>
-<e>
-<k>type_id</k>
-<v>9002061</v>
-</e>
-<e>
-<k>unspecified_type_id</k>
-<v>4949385</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>type_id</src>
-<trg>unspecified_type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9002061</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>unspecified_type_id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2701086</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1937281</v>
-</b>
-<b>
-<a>3</a>
-<b>7950</b>
-<v>311017</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>member</name>
-<cardinality>5094949</cardinality>
-<columnsizes>
-<e>
-<k>parent</k>
-<v>804764</v>
-</e>
-<e>
-<k>index</k>
-<v>2644</v>
-</e>
-<e>
-<k>child</k>
-<v>5079548</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>parent</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>70343</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>381479</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>94416</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>68793</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>59396</v>
-</b>
-<b>
-<a>9</a>
-<b>15</b>
-<v>63850</v>
-</b>
-<b>
-<a>15</a>
-<b>47</b>
-<v>60469</v>
-</b>
-<b>
-<a>47</a>
-<b>245</b>
-<v>6015</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>child</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>3</b>
-<v>69812</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>375930</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>97841</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>68685</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>59461</v>
-</b>
-<b>
-<a>9</a>
-<b>15</b>
-<v>64772</v>
-</b>
-<b>
-<a>15</a>
-<b>42</b>
-<v>60555</v>
-</b>
-<b>
-<a>42</a>
-<b>281</b>
-<v>7706</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>487</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>238</v>
-</b>
-<b>
-<a>5</a>
-<b>10</b>
-<v>227</v>
-</b>
-<b>
-<a>10</a>
-<b>64</b>
-<v>205</v>
-</b>
-<b>
-<a>65</a>
-<b>137</b>
-<v>205</v>
-</b>
-<b>
-<a>144</a>
-<b>213</b>
-<v>205</v>
-</b>
-<b>
-<a>219</a>
-<b>295</b>
-<v>205</v>
-</b>
-<b>
-<a>299</a>
-<b>393</b>
-<v>216</v>
-</b>
-<b>
-<a>393</a>
-<b>649</b>
-<v>205</v>
-</b>
-<b>
-<a>649</a>
-<b>3628</b>
-<v>205</v>
-</b>
-<b>
-<a>3644</a>
-<b>31598</b>
-<v>205</v>
-</b>
-<b>
-<a>65753</a>
-<b>73573</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>child</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>476</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>195</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>205</v>
-</b>
-<b>
-<a>9</a>
-<b>22</b>
-<v>205</v>
-</b>
-<b>
-<a>25</a>
-<b>132</b>
-<v>205</v>
-</b>
-<b>
-<a>132</a>
-<b>199</b>
-<v>205</v>
-</b>
-<b>
-<a>199</a>
-<b>279</b>
-<v>205</v>
-</b>
-<b>
-<a>279</a>
-<b>366</b>
-<v>205</v>
-</b>
-<b>
-<a>382</a>
-<b>480</b>
-<v>205</v>
-</b>
-<b>
-<a>489</a>
-<b>1630</b>
-<v>205</v>
-</b>
-<b>
-<a>1771</a>
-<b>8155</b>
-<v>205</v>
-</b>
-<b>
-<a>8939</a>
-<b>74519</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>child</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5079548</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>child</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5064362</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>15185</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>enclosingfunction</name>
-<cardinality>123615</cardinality>
-<columnsizes>
-<e>
-<k>child</k>
-<v>123615</v>
-</e>
-<e>
-<k>parent</k>
-<v>70570</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>child</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>123615</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>child</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>37892</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>20832</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6459</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>5310</v>
-</b>
-<b>
-<a>7</a>
-<b>45</b>
-<v>75</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>derivations</name>
-<cardinality>385706</cardinality>
-<columnsizes>
-<e>
-<k>derivation</k>
-<v>385706</v>
-</e>
-<e>
-<k>sub</k>
-<v>360192</v>
-</e>
-<e>
-<k>index</k>
-<v>65</v>
-</e>
-<e>
-<k>super</k>
-<v>232945</v>
-</e>
-<e>
-<k>location</k>
-<v>85961</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>derivation</src>
-<trg>sub</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>385706</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>derivation</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>385706</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>derivation</src>
-<trg>super</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>385706</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>derivation</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>385706</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sub</src>
-<trg>derivation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>337886</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>22306</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sub</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>347392</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>12800</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sub</src>
-<trg>super</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>337897</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>22295</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sub</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>347381</v>
-</b>
-<b>
-<a>2</a>
-<b>7</b>
-<v>12811</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>derivation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>44</a>
-<b>45</b>
-<v>10</v>
-</b>
-<b>
-<a>234</a>
-<b>235</b>
-<v>10</v>
-</b>
-<b>
-<a>1182</a>
-<b>1183</b>
-<v>10</v>
-</b>
-<b>
-<a>34121</a>
-<b>34122</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>sub</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>44</a>
-<b>45</b>
-<v>10</v>
-</b>
-<b>
-<a>234</a>
-<b>235</b>
-<v>10</v>
-</b>
-<b>
-<a>1181</a>
-<b>1182</b>
-<v>10</v>
-</b>
-<b>
-<a>33232</a>
-<b>33233</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>super</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-<b>
-<a>29</a>
-<b>30</b>
-<v>10</v>
-</b>
-<b>
-<a>84</a>
-<b>85</b>
-<v>10</v>
-</b>
-<b>
-<a>652</a>
-<b>653</b>
-<v>10</v>
-</b>
-<b>
-<a>20767</a>
-<b>20768</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>10</v>
-</b>
-<b>
-<a>51</a>
-<b>52</b>
-<v>10</v>
-</b>
-<b>
-<a>255</a>
-<b>256</b>
-<v>10</v>
-</b>
-<b>
-<a>7606</a>
-<b>7607</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>super</src>
-<trg>derivation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>218324</v>
-</b>
-<b>
-<a>2</a>
-<b>1142</b>
-<v>14621</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>super</src>
-<trg>sub</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>218335</v>
-</b>
-<b>
-<a>2</a>
-<b>1142</b>
-<v>14610</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>super</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>232501</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>444</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>super</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>225673</v>
-</b>
-<b>
-<a>2</a>
-<b>439</b>
-<v>7272</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>derivation</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>65574</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8291</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>6535</v>
-</b>
-<b>
-<a>7</a>
-<b>795</b>
-<v>5560</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>sub</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>67785</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6297</v>
-</b>
-<b>
-<a>3</a>
-<b>8</b>
-<v>6958</v>
-</b>
-<b>
-<a>8</a>
-<b>795</b>
-<v>4920</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>85940</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>super</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>68479</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8107</v>
-</b>
-<b>
-<a>3</a>
-<b>9</b>
-<v>6449</v>
-</b>
-<b>
-<a>9</a>
-<b>795</b>
-<v>2926</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>derspecifiers</name>
-<cardinality>388058</cardinality>
-<columnsizes>
-<e>
-<k>der_id</k>
-<v>385674</v>
-</e>
-<e>
-<k>spec_id</k>
-<v>43</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>der_id</src>
-<trg>spec_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>383289</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2384</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>spec_id</src>
-<trg>der_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>220</a>
-<b>221</b>
-<v>10</v>
-</b>
-<b>
-<a>263</a>
-<b>264</b>
-<v>10</v>
-</b>
-<b>
-<a>987</a>
-<b>988</b>
-<v>10</v>
-</b>
-<b>
-<a>34333</a>
-<b>34334</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>direct_base_offsets</name>
-<cardinality>306931</cardinality>
-<columnsizes>
-<e>
-<k>der_id</k>
-<v>306931</v>
-</e>
-<e>
-<k>offset</k>
-<v>195</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>der_id</src>
-<trg>offset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>306931</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>offset</src>
-<trg>der_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>21</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>21</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>10</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-<b>
-<a>21</a>
-<b>22</b>
-<v>10</v>
-</b>
-<b>
-<a>86</a>
-<b>87</b>
-<v>10</v>
-</b>
-<b>
-<a>214</a>
-<b>215</b>
-<v>10</v>
-</b>
-<b>
-<a>27928</a>
-<b>27929</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>virtual_base_offsets</name>
-<cardinality>6264</cardinality>
-<columnsizes>
-<e>
-<k>sub</k>
-<v>3468</v>
-</e>
-<e>
-<k>super</k>
-<v>476</v>
-</e>
-<e>
-<k>offset</k>
-<v>238</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>sub</src>
-<trg>super</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2731</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>303</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>249</v>
-</b>
-<b>
-<a>7</a>
-<b>11</b>
-<v>184</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>sub</src>
-<trg>offset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2926</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>292</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>249</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>super</src>
-<trg>sub</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>75</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>43</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>54</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>86</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>32</v>
-</b>
-<b>
-<a>8</a>
-<b>13</b>
-<v>43</v>
-</b>
-<b>
-<a>13</a>
-<b>15</b>
-<v>43</v>
-</b>
-<b>
-<a>15</a>
-<b>23</b>
-<v>43</v>
-</b>
-<b>
-<a>24</a>
-<b>60</b>
-<v>43</v>
-</b>
-<b>
-<a>196</a>
-<b>197</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>super</src>
-<trg>offset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>270</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>75</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>32</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>43</v>
-</b>
-<b>
-<a>8</a>
-<b>10</b>
-<v>43</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>offset</src>
-<trg>sub</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>32</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>21</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>21</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>32</v>
-</b>
-<b>
-<a>10</a>
-<b>12</b>
-<v>21</v>
-</b>
-<b>
-<a>14</a>
-<b>19</b>
-<v>21</v>
-</b>
-<b>
-<a>20</a>
-<b>27</b>
-<v>21</v>
-</b>
-<b>
-<a>28</a>
-<b>31</b>
-<v>21</v>
-</b>
-<b>
-<a>36</a>
-<b>97</b>
-<v>21</v>
-</b>
-<b>
-<a>97</a>
-<b>98</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>offset</src>
-<trg>super</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>75</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>32</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>43</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>21</v>
-</b>
-<b>
-<a>7</a>
-<b>10</b>
-<v>21</v>
-</b>
-<b>
-<a>12</a>
-<b>14</b>
-<v>21</v>
-</b>
-<b>
-<a>21</a>
-<b>29</b>
-<v>21</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>frienddecls</name>
-<cardinality>237444</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>237444</v>
-</e>
-<e>
-<k>type_id</k>
-<v>26966</v>
-</e>
-<e>
-<k>decl_id</k>
-<v>48405</v>
-</e>
-<e>
-<k>location</k>
-<v>7218</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>237444</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>decl_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>237444</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>237444</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6145</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10112</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>1961</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>899</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>2286</v>
-</b>
-<b>
-<a>8</a>
-<b>19</b>
-<v>2091</v>
-</b>
-<b>
-<a>21</a>
-<b>43</b>
-<v>2081</v>
-</b>
-<b>
-<a>43</a>
-<b>162</b>
-<v>1387</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>decl_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6145</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>10112</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>1961</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>899</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>2286</v>
-</b>
-<b>
-<a>8</a>
-<b>19</b>
-<v>2091</v>
-</b>
-<b>
-<a>21</a>
-<b>43</b>
-<v>2081</v>
-</b>
-<b>
-<a>43</a>
-<b>162</b>
-<v>1387</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>25405</v>
-</b>
-<b>
-<a>2</a>
-<b>31</b>
-<v>1560</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl_id</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>33242</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4931</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>3966</v>
-</b>
-<b>
-<a>7</a>
-<b>23</b>
-<v>3761</v>
-</b>
-<b>
-<a>23</a>
-<b>394</b>
-<v>2503</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl_id</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>33242</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4931</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>3966</v>
-</b>
-<b>
-<a>7</a>
-<b>23</b>
-<v>3761</v>
-</b>
-<b>
-<a>23</a>
-<b>394</b>
-<v>2503</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl_id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>47874</v>
-</b>
-<b>
-<a>2</a>
-<b>46</b>
-<v>531</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6167</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>932</v>
-</b>
-<b>
-<a>3</a>
-<b>21129</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6785</v>
-</b>
-<b>
-<a>2</a>
-<b>2097</b>
-<v>433</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>decl_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6178</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>921</v>
-</b>
-<b>
-<a>3</a>
-<b>3830</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>comments</name>
-<cardinality>1561817</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1561817</v>
-</e>
-<e>
-<k>contents</k>
-<v>774990</v>
-</e>
-<e>
-<k>location</k>
-<v>1561817</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>contents</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1561817</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1561817</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>contents</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>656176</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>74223</v>
-</b>
-<b>
-<a>3</a>
-<b>10738</b>
-<v>44590</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>contents</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>656176</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>74223</v>
-</b>
-<b>
-<a>3</a>
-<b>10738</b>
-<v>44590</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1561817</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>contents</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1561817</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>commentbinding</name>
-<cardinality>704994</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>611185</v>
-</e>
-<e>
-<k>element</k>
-<v>676553</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>element</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>550520</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>48514</v>
-</b>
-<b>
-<a>3</a>
-<b>97</b>
-<v>12150</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>648112</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>28440</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>exprconv</name>
-<cardinality>6470964</cardinality>
-<columnsizes>
-<e>
-<k>converted</k>
-<v>6470955</v>
-</e>
-<e>
-<k>conversion</k>
-<v>6470964</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>converted</src>
-<trg>conversion</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6470947</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>8</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>conversion</src>
-<trg>converted</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6470964</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>compgenerated</name>
-<cardinality>6859342</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>6859342</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>synthetic_destructor_call</name>
-<cardinality>58919</cardinality>
-<columnsizes>
-<e>
-<k>element</k>
-<v>45858</v>
-</e>
-<e>
-<k>i</k>
-<v>303</v>
-</e>
-<e>
-<k>destructor_call</k>
-<v>48893</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>element</src>
-<trg>i</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>36526</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6687</v>
-</b>
-<b>
-<a>3</a>
-<b>29</b>
-<v>2644</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element</src>
-<trg>destructor_call</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>36526</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6687</v>
-</b>
-<b>
-<a>3</a>
-<b>29</b>
-<v>2644</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>i</src>
-<trg>element</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>227</v>
-</b>
-<b>
-<a>2</a>
-<b>8</b>
-<v>21</v>
-</b>
-<b>
-<a>23</a>
-<b>48</b>
-<v>21</v>
-</b>
-<b>
-<a>244</a>
-<b>862</b>
-<v>21</v>
-</b>
-<b>
-<a>4231</a>
-<b>4232</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>i</src>
-<trg>destructor_call</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>227</v>
-</b>
-<b>
-<a>2</a>
-<b>8</b>
-<v>21</v>
-</b>
-<b>
-<a>22</a>
-<b>42</b>
-<v>21</v>
-</b>
-<b>
-<a>187</a>
-<b>667</b>
-<v>21</v>
-</b>
-<b>
-<a>3565</a>
-<b>3566</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>destructor_call</src>
-<trg>element</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>43116</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3576</v>
-</b>
-<b>
-<a>3</a>
-<b>26</b>
-<v>2200</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>destructor_call</src>
-<trg>i</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>48893</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>namespaces</name>
-<cardinality>7597</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>7597</v>
-</e>
-<e>
-<k>name</k>
-<v>4086</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7597</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3435</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>411</v>
-</b>
-<b>
-<a>3</a>
-<b>139</b>
-<v>238</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>namespace_inline</name>
-<cardinality>151</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>151</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>namespacembrs</name>
-<cardinality>1584090</cardinality>
-<columnsizes>
-<e>
-<k>parentid</k>
-<v>7077</v>
-</e>
-<e>
-<k>memberid</k>
-<v>1584090</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>parentid</src>
-<trg>memberid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>726</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>791</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>346</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>520</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>552</v>
-</b>
-<b>
-<a>7</a>
-<b>12</b>
-<v>574</v>
-</b>
-<b>
-<a>12</a>
-<b>19</b>
-<v>531</v>
-</b>
-<b>
-<a>19</a>
-<b>34</b>
-<v>541</v>
-</b>
-<b>
-<a>36</a>
-<b>52</b>
-<v>574</v>
-</b>
-<b>
-<a>52</a>
-<b>105</b>
-<v>531</v>
-</b>
-<b>
-<a>105</a>
-<b>230</b>
-<v>541</v>
-</b>
-<b>
-<a>231</a>
-<b>744</b>
-<v>531</v>
-</b>
-<b>
-<a>778</a>
-<b>39452</b>
-<v>314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>memberid</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1584090</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>exprparents</name>
-<cardinality>13432189</cardinality>
-<columnsizes>
-<e>
-<k>expr_id</k>
-<v>13432000</v>
-</e>
-<e>
-<k>child_index</k>
-<v>3118</v>
-</e>
-<e>
-<k>parent_id</k>
-<v>9515340</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr_id</src>
-<trg>child_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13431994</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr_id</src>
-<trg>parent_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13431818</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>181</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>child_index</src>
-<trg>expr_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>71</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>643</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1649</v>
-</b>
-<b>
-<a>4</a>
-<b>46</b>
-<v>240</v>
-</b>
-<b>
-<a>46</a>
-<b>56</b>
-<v>233</v>
-</b>
-<b>
-<a>56</a>
-<b>3654</b>
-<v>233</v>
-</b>
-<b>
-<a>6420</a>
-<b>1188854</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>child_index</src>
-<trg>parent_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>71</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>643</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1649</v>
-</b>
-<b>
-<a>4</a>
-<b>31</b>
-<v>240</v>
-</b>
-<b>
-<a>31</a>
-<b>41</b>
-<v>233</v>
-</b>
-<b>
-<a>41</a>
-<b>3639</b>
-<v>233</v>
-</b>
-<b>
-<a>6405</a>
-<b>1188867</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent_id</src>
-<trg>expr_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6748421</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2184263</v>
-</b>
-<b>
-<a>3</a>
-<b>1681</b>
-<v>582655</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent_id</src>
-<trg>child_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6748441</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2184243</v>
-</b>
-<b>
-<a>3</a>
-<b>480</b>
-<v>582655</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_isload</name>
-<cardinality>5009424</cardinality>
-<columnsizes>
-<e>
-<k>expr_id</k>
-<v>5009424</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>conversionkinds</name>
-<cardinality>4246766</cardinality>
-<columnsizes>
-<e>
-<k>expr_id</k>
-<v>4246766</v>
-</e>
-<e>
-<k>kind</k>
-<v>6</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr_id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4246766</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>expr_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2189</a>
-<b>2190</b>
-<v>1</v>
-</b>
-<b>
-<a>3368</a>
-<b>3369</b>
-<v>1</v>
-</b>
-<b>
-<a>13714</a>
-<b>13715</b>
-<v>1</v>
-</b>
-<b>
-<a>26502</a>
-<b>26503</b>
-<v>1</v>
-</b>
-<b>
-<a>45529</a>
-<b>45530</b>
-<v>1</v>
-</b>
-<b>
-<a>4155464</a>
-<b>4155465</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>iscall</name>
-<cardinality>2293539</cardinality>
-<columnsizes>
-<e>
-<k>caller</k>
-<v>2293539</v>
-</e>
-<e>
-<k>kind</k>
-<v>32</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>caller</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2293539</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>caller</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1386</a>
-<b>1387</b>
-<v>10</v>
-</b>
-<b>
-<a>6427</a>
-<b>6428</b>
-<v>10</v>
-</b>
-<b>
-<a>203793</a>
-<b>203794</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>numtemplatearguments</name>
-<cardinality>162776</cardinality>
-<columnsizes>
-<e>
-<k>expr_id</k>
-<v>162776</v>
-</e>
-<e>
-<k>num</k>
-<v>43</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr_id</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>162776</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>expr_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-<b>
-<a>41</a>
-<b>42</b>
-<v>10</v>
-</b>
-<b>
-<a>669</a>
-<b>670</b>
-<v>10</v>
-</b>
-<b>
-<a>14305</a>
-<b>14306</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>specialnamequalifyingelements</name>
-<cardinality>10</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>10</v>
-</e>
-<e>
-<k>name</k>
-<v>10</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>namequalifiers</name>
-<cardinality>1119060</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1119060</v>
-</e>
-<e>
-<k>qualifiableelement</k>
-<v>1119060</v>
-</e>
-<e>
-<k>qualifyingelement</k>
-<v>38800</v>
-</e>
-<e>
-<k>location</k>
-<v>504119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>qualifiableelement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1119060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>qualifyingelement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1119060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1119060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>qualifiableelement</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1119060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>qualifiableelement</src>
-<trg>qualifyingelement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1119060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>qualifiableelement</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1119060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>qualifyingelement</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18890</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8035</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>4975</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>3079</v>
-</b>
-<b>
-<a>11</a>
-<b>121</b>
-<v>2910</v>
-</b>
-<b>
-<a>124</a>
-<b>24963</b>
-<v>909</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>qualifyingelement</src>
-<trg>qualifiableelement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18890</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8035</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>4975</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>3079</v>
-</b>
-<b>
-<a>11</a>
-<b>121</b>
-<v>2910</v>
-</b>
-<b>
-<a>124</a>
-<b>24963</b>
-<v>909</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>qualifyingelement</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>24749</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>4670</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>3709</v>
-</b>
-<b>
-<a>4</a>
-<b>11</b>
-<v>3027</v>
-</b>
-<b>
-<a>11</a>
-<b>16750</b>
-<v>2643</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>380150</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>56638</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>41762</v>
-</b>
-<b>
-<a>7</a>
-<b>381</b>
-<v>25568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>qualifiableelement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>380150</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>56638</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>41762</v>
-</b>
-<b>
-<a>7</a>
-<b>381</b>
-<v>25568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>qualifyingelement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>444298</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>44477</v>
-</b>
-<b>
-<a>3</a>
-<b>190</b>
-<v>15343</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>varbind</name>
-<cardinality>5425985</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>5425862</v>
-</e>
-<e>
-<k>var</k>
-<v>1530372</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>var</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5425738</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>123</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>var</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>678893</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>308409</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>232367</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>92671</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>132849</v>
-</b>
-<b>
-<a>9</a>
-<b>6150</b>
-<v>85181</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>funbind</name>
-<cardinality>2412732</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>2116341</v>
-</e>
-<e>
-<k>fun</k>
-<v>433346</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>fun</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1820189</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>295975</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fun</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>251653</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>75463</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>31180</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>33850</v>
-</b>
-<b>
-<a>7</a>
-<b>37</b>
-<v>33376</v>
-</b>
-<b>
-<a>37</a>
-<b>6664</b>
-<v>7821</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_allocator</name>
-<cardinality>29979</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>29979</v>
-</e>
-<e>
-<k>func</k>
-<v>119</v>
-</e>
-<e>
-<k>form</k>
-<v>10</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>func</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>29979</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>form</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>29979</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>func</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>10</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>21</v>
-</b>
-<b>
-<a>42</a>
-<b>43</b>
-<v>10</v>
-</b>
-<b>
-<a>1327</a>
-<b>1328</b>
-<v>10</v>
-</b>
-<b>
-<a>1366</a>
-<b>1367</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>func</src>
-<trg>form</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>form</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2766</a>
-<b>2767</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>form</src>
-<trg>func</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>11</a>
-<b>12</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_deallocator</name>
-<cardinality>32917</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>32917</v>
-</e>
-<e>
-<k>func</k>
-<v>130</v>
-</e>
-<e>
-<k>form</k>
-<v>21</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>func</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32917</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>form</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32917</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>func</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>10</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>21</v>
-</b>
-<b>
-<a>118</a>
-<b>119</b>
-<v>10</v>
-</b>
-<b>
-<a>1274</a>
-<b>1275</b>
-<v>10</v>
-</b>
-<b>
-<a>1615</a>
-<b>1616</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>func</src>
-<trg>form</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>130</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>form</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1284</a>
-<b>1285</b>
-<v>10</v>
-</b>
-<b>
-<a>1753</a>
-<b>1754</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>form</src>
-<trg>func</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_cond_two_operand</name>
-<cardinality>612</cardinality>
-<columnsizes>
-<e>
-<k>cond</k>
-<v>612</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>expr_cond_guard</name>
-<cardinality>154485</cardinality>
-<columnsizes>
-<e>
-<k>cond</k>
-<v>154485</v>
-</e>
-<e>
-<k>guard</k>
-<v>154485</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>cond</src>
-<trg>guard</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154485</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>guard</src>
-<trg>cond</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154485</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_cond_true</name>
-<cardinality>154485</cardinality>
-<columnsizes>
-<e>
-<k>cond</k>
-<v>154485</v>
-</e>
-<e>
-<k>true</k>
-<v>154485</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>cond</src>
-<trg>true</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154485</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>true</src>
-<trg>cond</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154485</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_cond_false</name>
-<cardinality>154485</cardinality>
-<columnsizes>
-<e>
-<k>cond</k>
-<v>154485</v>
-</e>
-<e>
-<k>false</k>
-<v>154485</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>cond</src>
-<trg>false</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154485</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>false</src>
-<trg>cond</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>154485</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>values</name>
-<cardinality>8774622</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>8774622</v>
-</e>
-<e>
-<k>str</k>
-<v>651637</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>str</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8774622</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>str</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>540186</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>65496</v>
-</b>
-<b>
-<a>3</a>
-<b>4040441</b>
-<v>45955</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>valuetext</name>
-<cardinality>4778502</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4778502</v>
-</e>
-<e>
-<k>text</k>
-<v>706785</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4778502</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>529394</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>102965</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>57061</v>
-</b>
-<b>
-<a>7</a>
-<b>427516</b>
-<v>17365</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>valuebind</name>
-<cardinality>9496119</cardinality>
-<columnsizes>
-<e>
-<k>val</k>
-<v>8768412</v>
-</e>
-<e>
-<k>expr</k>
-<v>9496119</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>val</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8041464</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>726192</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>756</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>val</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9496119</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fieldoffsets</name>
-<cardinality>250750</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>250750</v>
-</e>
-<e>
-<k>byteoffset</k>
-<v>8983</v>
-</e>
-<e>
-<k>bitoffset</k>
-<v>51</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>byteoffset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>250750</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>bitoffset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>250750</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>byteoffset</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6106</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>779</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>747</v>
-</b>
-<b>
-<a>6</a>
-<b>17</b>
-<v>675</v>
-</b>
-<b>
-<a>17</a>
-<b>11719</b>
-<v>675</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>byteoffset</src>
-<trg>bitoffset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8542</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>441</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bitoffset</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>83</a>
-<b>84</b>
-<v>6</v>
-</b>
-<b>
-<a>87</a>
-<b>88</b>
-<v>6</v>
-</b>
-<b>
-<a>102</a>
-<b>103</b>
-<v>6</v>
-</b>
-<b>
-<a>122</a>
-<b>123</b>
-<v>6</v>
-</b>
-<b>
-<a>127</a>
-<b>128</b>
-<v>6</v>
-</b>
-<b>
-<a>153</a>
-<b>154</b>
-<v>6</v>
-</b>
-<b>
-<a>195</a>
-<b>196</b>
-<v>6</v>
-</b>
-<b>
-<a>37732</a>
-<b>37733</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bitoffset</src>
-<trg>byteoffset</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>40</a>
-<b>41</b>
-<v>6</v>
-</b>
-<b>
-<a>44</a>
-<b>45</b>
-<v>6</v>
-</b>
-<b>
-<a>45</a>
-<b>46</b>
-<v>6</v>
-</b>
-<b>
-<a>52</a>
-<b>53</b>
-<v>6</v>
-</b>
-<b>
-<a>54</a>
-<b>55</b>
-<v>6</v>
-</b>
-<b>
-<a>58</a>
-<b>59</b>
-<v>6</v>
-</b>
-<b>
-<a>66</a>
-<b>67</b>
-<v>6</v>
-</b>
-<b>
-<a>1383</a>
-<b>1384</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>bitfield</name>
-<cardinality>13845</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>13845</v>
-</e>
-<e>
-<k>bits</k>
-<v>68</v>
-</e>
-<e>
-<k>declared_bits</k>
-<v>68</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>bits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13845</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>declared_bits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13845</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bits</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>14</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>8</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>4</v>
-</b>
-<b>
-<a>8</a>
-<b>14</b>
-<v>4</v>
-</b>
-<b>
-<a>17</a>
-<b>36</b>
-<v>4</v>
-</b>
-<b>
-<a>37</a>
-<b>94</b>
-<v>4</v>
-</b>
-<b>
-<a>97</a>
-<b>152</b>
-<v>4</v>
-</b>
-<b>
-<a>2106</a>
-<b>5611</b>
-<v>3</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>bits</src>
-<trg>declared_bits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>68</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>declared_bits</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>14</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>8</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>4</v>
-</b>
-<b>
-<a>8</a>
-<b>14</b>
-<v>4</v>
-</b>
-<b>
-<a>17</a>
-<b>36</b>
-<v>4</v>
-</b>
-<b>
-<a>37</a>
-<b>94</b>
-<v>4</v>
-</b>
-<b>
-<a>97</a>
-<b>152</b>
-<v>4</v>
-</b>
-<b>
-<a>2106</a>
-<b>5611</b>
-<v>3</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>declared_bits</src>
-<trg>bits</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>68</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>initialisers</name>
-<cardinality>1662175</cardinality>
-<columnsizes>
-<e>
-<k>init</k>
-<v>1662175</v>
-</e>
-<e>
-<k>var</k>
-<v>641756</v>
-</e>
-<e>
-<k>expr</k>
-<v>1662175</v>
-</e>
-<e>
-<k>location</k>
-<v>318179</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>init</src>
-<trg>var</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1662175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>init</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1662175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>init</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1662175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>var</src>
-<trg>init</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>555333</v>
-</b>
-<b>
-<a>2</a>
-<b>16</b>
-<v>28660</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>48973</v>
-</b>
-<b>
-<a>17</a>
-<b>53</b>
-<v>8789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>var</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>555333</v>
-</b>
-<b>
-<a>2</a>
-<b>16</b>
-<v>28660</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>48973</v>
-</b>
-<b>
-<a>17</a>
-<b>53</b>
-<v>8789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>var</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>641743</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>init</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1662175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>var</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1662175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1662175</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>init</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>245703</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>23690</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>24210</v>
-</b>
-<b>
-<a>7</a>
-<b>65</b>
-<v>24048</v>
-</b>
-<b>
-<a>67</a>
-<b>109109</b>
-<v>526</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>var</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>268251</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>24931</v>
-</b>
-<b>
-<a>3</a>
-<b>22</b>
-<v>23885</v>
-</b>
-<b>
-<a>22</a>
-<b>12503</b>
-<v>1110</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>245703</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>23690</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>24210</v>
-</b>
-<b>
-<a>7</a>
-<b>65</b>
-<v>24048</v>
-</b>
-<b>
-<a>67</a>
-<b>109109</b>
-<v>526</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_ancestor</name>
-<cardinality>65325</cardinality>
-<columnsizes>
-<e>
-<k>exp</k>
-<v>64631</v>
-</e>
-<e>
-<k>ancestor</k>
-<v>46563</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>exp</src>
-<trg>ancestor</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>64002</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>628</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>ancestor</src>
-<trg>exp</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>34543</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>9592</v>
-</b>
-<b>
-<a>3</a>
-<b>29</b>
-<v>2427</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>exprs</name>
-<cardinality>18461258</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>18461258</v>
-</e>
-<e>
-<k>kind</k>
-<v>1094</v>
-</e>
-<e>
-<k>location</k>
-<v>3585917</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18461258</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18461258</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>14</b>
-<v>86</v>
-</b>
-<b>
-<a>15</a>
-<b>50</b>
-<v>86</v>
-</b>
-<b>
-<a>50</a>
-<b>90</b>
-<v>86</v>
-</b>
-<b>
-<a>90</a>
-<b>223</b>
-<v>86</v>
-</b>
-<b>
-<a>306</a>
-<b>472</b>
-<v>86</v>
-</b>
-<b>
-<a>484</a>
-<b>715</b>
-<v>86</v>
-</b>
-<b>
-<a>866</a>
-<b>2036</b>
-<v>86</v>
-</b>
-<b>
-<a>2167</a>
-<b>2960</b>
-<v>86</v>
-</b>
-<b>
-<a>3202</a>
-<b>4443</b>
-<v>86</v>
-</b>
-<b>
-<a>4720</a>
-<b>6423</b>
-<v>86</v>
-</b>
-<b>
-<a>6723</a>
-<b>13439</b>
-<v>86</v>
-</b>
-<b>
-<a>17876</a>
-<b>100489</b>
-<v>86</v>
-</b>
-<b>
-<a>114342</a>
-<b>428357</b>
-<v>54</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>4</b>
-<v>97</v>
-</b>
-<b>
-<a>4</a>
-<b>14</b>
-<v>97</v>
-</b>
-<b>
-<a>14</a>
-<b>24</b>
-<v>86</v>
-</b>
-<b>
-<a>24</a>
-<b>38</b>
-<v>86</v>
-</b>
-<b>
-<a>38</a>
-<b>134</b>
-<v>86</v>
-</b>
-<b>
-<a>144</a>
-<b>259</b>
-<v>86</v>
-</b>
-<b>
-<a>270</a>
-<b>481</b>
-<v>86</v>
-</b>
-<b>
-<a>481</a>
-<b>1076</b>
-<v>86</v>
-</b>
-<b>
-<a>1099</a>
-<b>1408</b>
-<v>86</v>
-</b>
-<b>
-<a>1427</a>
-<b>2051</b>
-<v>86</v>
-</b>
-<b>
-<a>2060</a>
-<b>4561</b>
-<v>86</v>
-</b>
-<b>
-<a>5889</a>
-<b>59193</b>
-<v>86</v>
-</b>
-<b>
-<a>60309</a>
-<b>118611</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1649719</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>725837</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>318788</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>272431</v>
-</b>
-<b>
-<a>5</a>
-<b>9</b>
-<v>311028</v>
-</b>
-<b>
-<a>9</a>
-<b>45</b>
-<v>269006</v>
-</b>
-<b>
-<a>45</a>
-<b>143462</b>
-<v>39106</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2542158</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>786154</v>
-</b>
-<b>
-<a>3</a>
-<b>30</b>
-<v>257604</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>expr_types</name>
-<cardinality>18609954</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>18457486</v>
-</e>
-<e>
-<k>typeid</k>
-<v>1280368</v>
-</e>
-<e>
-<k>value_category</k>
-<v>32</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>typeid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18306730</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>150755</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>value_category</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18457486</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>typeid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>468861</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>252672</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>107476</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>88617</v>
-</b>
-<b>
-<a>5</a>
-<b>8</b>
-<v>114110</v>
-</b>
-<b>
-<a>8</a>
-<b>13</b>
-<v>96724</v>
-</b>
-<b>
-<a>13</a>
-<b>36</b>
-<v>97331</v>
-</b>
-<b>
-<a>36</a>
-<b>126306</b>
-<v>54572</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>typeid</src>
-<trg>value_category</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1115749</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>155026</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>9592</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value_category</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>7302</a>
-<b>7303</b>
-<v>10</v>
-</b>
-<b>
-<a>383285</a>
-<b>383286</b>
-<v>10</v>
-</b>
-<b>
-<a>1312333</a>
-<b>1312334</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value_category</src>
-<trg>typeid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1649</a>
-<b>1650</b>
-<v>10</v>
-</b>
-<b>
-<a>32129</a>
-<b>32130</b>
-<v>10</v>
-</b>
-<b>
-<a>100424</a>
-<b>100425</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>new_allocated_type</name>
-<cardinality>31757</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>31757</v>
-</e>
-<e>
-<k>type_id</k>
-<v>16323</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31757</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10220</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3674</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>1387</v>
-</b>
-<b>
-<a>5</a>
-<b>107</b>
-<v>1040</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>new_array_allocated_type</name>
-<cardinality>5287</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>5287</v>
-</e>
-<e>
-<k>type_id</k>
-<v>2273</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5287</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2013</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>175</v>
-</b>
-<b>
-<a>8</a>
-<b>15</b>
-<v>51</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>aggregate_field_init</name>
-<cardinality>4011083</cardinality>
-<columnsizes>
-<e>
-<k>aggregate</k>
-<v>849492</v>
-</e>
-<e>
-<k>initializer</k>
-<v>4010900</v>
-</e>
-<e>
-<k>field</k>
-<v>2207</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>aggregate</src>
-<trg>initializer</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6536</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>501609</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>11344</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>88845</v>
-</b>
-<b>
-<a>5</a>
-<b>12</b>
-<v>49882</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>191083</v>
-</b>
-<b>
-<a>13</a>
-<b>42</b>
-<v>193</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>aggregate</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6535</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>501577</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>11344</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>88851</v>
-</b>
-<b>
-<a>5</a>
-<b>12</b>
-<v>49908</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>191083</v>
-</b>
-<b>
-<a>13</a>
-<b>42</b>
-<v>194</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>initializer</src>
-<trg>aggregate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4010900</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>initializer</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4010717</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>183</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>aggregate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>814</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>194</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>194</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>174</v>
-</b>
-<b>
-<a>13</a>
-<b>22</b>
-<v>176</v>
-</b>
-<b>
-<a>22</a>
-<b>47</b>
-<v>168</v>
-</b>
-<b>
-<a>49</a>
-<b>113</b>
-<v>166</v>
-</b>
-<b>
-<a>115</a>
-<b>410</b>
-<v>168</v>
-</b>
-<b>
-<a>417</a>
-<b>288626</b>
-<v>153</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>initializer</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>814</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>194</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>194</v>
-</b>
-<b>
-<a>7</a>
-<b>13</b>
-<v>174</v>
-</b>
-<b>
-<a>13</a>
-<b>22</b>
-<v>176</v>
-</b>
-<b>
-<a>22</a>
-<b>47</b>
-<v>168</v>
-</b>
-<b>
-<a>49</a>
-<b>113</b>
-<v>166</v>
-</b>
-<b>
-<a>115</a>
-<b>410</b>
-<v>168</v>
-</b>
-<b>
-<a>417</a>
-<b>288626</b>
-<v>153</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>aggregate_array_init</name>
-<cardinality>731690</cardinality>
-<columnsizes>
-<e>
-<k>aggregate</k>
-<v>65759</v>
-</e>
-<e>
-<k>initializer</k>
-<v>731690</v>
-</e>
-<e>
-<k>element_index</k>
-<v>17485</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>aggregate</src>
-<trg>initializer</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7541</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>7819</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>17355</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>8024</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>5817</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>5016</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>5394</v>
-</b>
-<b>
-<a>11</a>
-<b>22</b>
-<v>5004</v>
-</b>
-<b>
-<a>22</a>
-<b>17486</b>
-<v>3789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>aggregate</src>
-<trg>element_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>7541</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>7819</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>17355</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>8024</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>5817</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>5016</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>5394</v>
-</b>
-<b>
-<a>11</a>
-<b>22</b>
-<v>5004</v>
-</b>
-<b>
-<a>22</a>
-<b>17486</b>
-<v>3789</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>initializer</src>
-<trg>aggregate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>731690</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>initializer</src>
-<trg>element_index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>731690</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element_index</src>
-<trg>aggregate</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6580</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2653</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>1308</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>1488</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>1059</v>
-</b>
-<b>
-<a>9</a>
-<b>15</b>
-<v>1388</v>
-</b>
-<b>
-<a>15</a>
-<b>27</b>
-<v>1379</v>
-</b>
-<b>
-<a>27</a>
-<b>198</b>
-<v>1316</v>
-</b>
-<b>
-<a>202</a>
-<b>65759</b>
-<v>314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>element_index</src>
-<trg>initializer</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6580</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2653</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>1308</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>1488</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>1059</v>
-</b>
-<b>
-<a>9</a>
-<b>15</b>
-<v>1388</v>
-</b>
-<b>
-<a>15</a>
-<b>27</b>
-<v>1379</v>
-</b>
-<b>
-<a>27</a>
-<b>198</b>
-<v>1316</v>
-</b>
-<b>
-<a>202</a>
-<b>65759</b>
-<v>314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>condition_decl_bind</name>
-<cardinality>6947</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>6947</v>
-</e>
-<e>
-<k>decl</k>
-<v>6947</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6947</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6947</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>typeid_bind</name>
-<cardinality>4368</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>4368</v>
-</e>
-<e>
-<k>type_id</k>
-<v>2319</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4368</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1159</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>888</v>
-</b>
-<b>
-<a>3</a>
-<b>6</b>
-<v>205</v>
-</b>
-<b>
-<a>6</a>
-<b>17</b>
-<v>65</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>uuidof_bind</name>
-<cardinality>844</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>844</v>
-</e>
-<e>
-<k>type_id</k>
-<v>643</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>844</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>474</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>136</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>sizeof_bind</name>
-<cardinality>157116</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>157116</v>
-</e>
-<e>
-<k>type_id</k>
-<v>2704</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>157116</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>type_id</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1063</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>356</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>202</v>
-</b>
-<b>
-<a>4</a>
-<b>9</b>
-<v>202</v>
-</b>
-<b>
-<a>9</a>
-<b>32</b>
-<v>129</v>
-</b>
-<b>
-<a>34</a>
-<b>36</b>
-<v>233</v>
-</b>
-<b>
-<a>36</a>
-<b>68</b>
-<v>202</v>
-</b>
-<b>
-<a>68</a>
-<b>114</b>
-<v>202</v>
-</b>
-<b>
-<a>119</a>
-<b>6844</b>
-<v>110</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>code_block</name>
-<cardinality>15</cardinality>
-<columnsizes>
-<e>
-<k>block</k>
-<v>15</v>
-</e>
-<e>
-<k>routine</k>
-<v>15</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>block</src>
-<trg>routine</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>15</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>routine</src>
-<trg>block</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>15</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>lambdas</name>
-<cardinality>12660</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>12660</v>
-</e>
-<e>
-<k>default_capture</k>
-<v>19</v>
-</e>
-<e>
-<k>has_explicit_return_type</k>
-<v>12</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>default_capture</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12660</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>has_explicit_return_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12660</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>default_capture</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>278</a>
-<b>279</b>
-<v>6</v>
-</b>
-<b>
-<a>700</a>
-<b>701</b>
-<v>6</v>
-</b>
-<b>
-<a>971</a>
-<b>972</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>default_capture</src>
-<trg>has_explicit_return_type</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>19</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>has_explicit_return_type</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>832</a>
-<b>833</b>
-<v>6</v>
-</b>
-<b>
-<a>1117</a>
-<b>1118</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>has_explicit_return_type</src>
-<trg>default_capture</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>3</a>
-<b>4</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>lambda_capture</name>
-<cardinality>21618</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>21618</v>
-</e>
-<e>
-<k>lambda</k>
-<v>10153</v>
-</e>
-<e>
-<k>index</k>
-<v>110</v>
-</e>
-<e>
-<k>field</k>
-<v>21618</v>
-</e>
-<e>
-<k>captured_by_reference</k>
-<v>12</v>
-</e>
-<e>
-<k>is_implicit</k>
-<v>12</v>
-</e>
-<e>
-<k>location</k>
-<v>13849</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>lambda</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>captured_by_reference</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>is_implicit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>lambda</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5131</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2345</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1247</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>909</v>
-</b>
-<b>
-<a>6</a>
-<b>18</b>
-<v>519</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>lambda</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5131</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2345</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1247</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>909</v>
-</b>
-<b>
-<a>6</a>
-<b>18</b>
-<v>519</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>lambda</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5131</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2345</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1247</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>909</v>
-</b>
-<b>
-<a>6</a>
-<b>18</b>
-<v>519</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>lambda</src>
-<trg>captured_by_reference</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>9691</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>461</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>lambda</src>
-<trg>is_implicit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>10133</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>19</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>lambda</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>5606</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2468</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1026</v>
-</b>
-<b>
-<a>4</a>
-<b>7</b>
-<v>811</v>
-</b>
-<b>
-<a>7</a>
-<b>18</b>
-<v>240</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>6</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>6</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>6</v>
-</b>
-<b>
-<a>18</a>
-<b>19</b>
-<v>6</v>
-</b>
-<b>
-<a>23</a>
-<b>24</b>
-<v>6</v>
-</b>
-<b>
-<a>45</a>
-<b>46</b>
-<v>6</v>
-</b>
-<b>
-<a>80</a>
-<b>81</b>
-<v>6</v>
-</b>
-<b>
-<a>140</a>
-<b>141</b>
-<v>6</v>
-</b>
-<b>
-<a>220</a>
-<b>221</b>
-<v>6</v>
-</b>
-<b>
-<a>412</a>
-<b>413</b>
-<v>6</v>
-</b>
-<b>
-<a>773</a>
-<b>774</b>
-<v>6</v>
-</b>
-<b>
-<a>1563</a>
-<b>1564</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>lambda</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>6</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>6</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>6</v>
-</b>
-<b>
-<a>18</a>
-<b>19</b>
-<v>6</v>
-</b>
-<b>
-<a>23</a>
-<b>24</b>
-<v>6</v>
-</b>
-<b>
-<a>45</a>
-<b>46</b>
-<v>6</v>
-</b>
-<b>
-<a>80</a>
-<b>81</b>
-<v>6</v>
-</b>
-<b>
-<a>140</a>
-<b>141</b>
-<v>6</v>
-</b>
-<b>
-<a>220</a>
-<b>221</b>
-<v>6</v>
-</b>
-<b>
-<a>412</a>
-<b>413</b>
-<v>6</v>
-</b>
-<b>
-<a>773</a>
-<b>774</b>
-<v>6</v>
-</b>
-<b>
-<a>1563</a>
-<b>1564</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6</v>
-</b>
-<b>
-<a>10</a>
-<b>11</b>
-<v>6</v>
-</b>
-<b>
-<a>12</a>
-<b>13</b>
-<v>6</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>6</v>
-</b>
-<b>
-<a>18</a>
-<b>19</b>
-<v>6</v>
-</b>
-<b>
-<a>23</a>
-<b>24</b>
-<v>6</v>
-</b>
-<b>
-<a>45</a>
-<b>46</b>
-<v>6</v>
-</b>
-<b>
-<a>80</a>
-<b>81</b>
-<v>6</v>
-</b>
-<b>
-<a>140</a>
-<b>141</b>
-<v>6</v>
-</b>
-<b>
-<a>220</a>
-<b>221</b>
-<v>6</v>
-</b>
-<b>
-<a>412</a>
-<b>413</b>
-<v>6</v>
-</b>
-<b>
-<a>773</a>
-<b>774</b>
-<v>6</v>
-</b>
-<b>
-<a>1563</a>
-<b>1564</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>captured_by_reference</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>25</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>84</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>is_implicit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>64</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>6</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>6</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>6</v>
-</b>
-<b>
-<a>14</a>
-<b>15</b>
-<v>6</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>6</v>
-</b>
-<b>
-<a>21</a>
-<b>22</b>
-<v>6</v>
-</b>
-<b>
-<a>40</a>
-<b>41</b>
-<v>6</v>
-</b>
-<b>
-<a>64</a>
-<b>65</b>
-<v>6</v>
-</b>
-<b>
-<a>99</a>
-<b>100</b>
-<v>6</v>
-</b>
-<b>
-<a>176</a>
-<b>177</b>
-<v>6</v>
-</b>
-<b>
-<a>349</a>
-<b>350</b>
-<v>6</v>
-</b>
-<b>
-<a>589</a>
-<b>590</b>
-<v>6</v>
-</b>
-<b>
-<a>932</a>
-<b>933</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>lambda</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>captured_by_reference</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>is_implicit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>field</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21618</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>captured_by_reference</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1201</a>
-<b>1202</b>
-<v>6</v>
-</b>
-<b>
-<a>2127</a>
-<b>2128</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>captured_by_reference</src>
-<trg>lambda</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>613</a>
-<b>614</b>
-<v>6</v>
-</b>
-<b>
-<a>1021</a>
-<b>1022</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>captured_by_reference</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>13</a>
-<b>14</b>
-<v>6</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>captured_by_reference</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1201</a>
-<b>1202</b>
-<v>6</v>
-</b>
-<b>
-<a>2127</a>
-<b>2128</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>captured_by_reference</src>
-<trg>is_implicit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>captured_by_reference</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>544</a>
-<b>545</b>
-<v>6</v>
-</b>
-<b>
-<a>1591</a>
-<b>1592</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_implicit</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>848</a>
-<b>849</b>
-<v>6</v>
-</b>
-<b>
-<a>2480</a>
-<b>2481</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_implicit</src>
-<trg>lambda</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>637</a>
-<b>638</b>
-<v>6</v>
-</b>
-<b>
-<a>929</a>
-<b>930</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_implicit</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>7</a>
-<b>8</b>
-<v>6</v>
-</b>
-<b>
-<a>17</a>
-<b>18</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_implicit</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>848</a>
-<b>849</b>
-<v>6</v>
-</b>
-<b>
-<a>2480</a>
-<b>2481</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_implicit</src>
-<trg>captured_by_reference</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>12</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_implicit</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>330</a>
-<b>331</b>
-<v>6</v>
-</b>
-<b>
-<a>1802</a>
-<b>1803</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12485</v>
-</b>
-<b>
-<a>2</a>
-<b>6</b>
-<v>1039</v>
-</b>
-<b>
-<a>6</a>
-<b>68</b>
-<v>324</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>lambda</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12926</v>
-</b>
-<b>
-<a>2</a>
-<b>68</b>
-<v>922</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13316</v>
-</b>
-<b>
-<a>2</a>
-<b>8</b>
-<v>532</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>field</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>12485</v>
-</b>
-<b>
-<a>2</a>
-<b>6</b>
-<v>1039</v>
-</b>
-<b>
-<a>6</a>
-<b>68</b>
-<v>324</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>captured_by_reference</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13829</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>19</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>is_implicit</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>13849</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>fold</name>
-<cardinality>4</cardinality>
-<columnsizes>
-<e>
-<k>expr</k>
-<v>4</v>
-</e>
-<e>
-<k>operator</k>
-<v>4</v>
-</e>
-<e>
-<k>is_left_fold</k>
-<v>2</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>expr</src>
-<trg>operator</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>expr</src>
-<trg>is_left_fold</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>operator</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>operator</src>
-<trg>is_left_fold</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_left_fold</src>
-<trg>expr</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>is_left_fold</src>
-<trg>operator</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>stmts</name>
-<cardinality>4651977</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4651977</v>
-</e>
-<e>
-<k>kind</k>
-<v>116</v>
-</e>
-<e>
-<k>location</k>
-<v>2016407</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4651977</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4651977</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>26</a>
-<b>27</b>
-<v>6</v>
-</b>
-<b>
-<a>553</a>
-<b>554</b>
-<v>6</v>
-</b>
-<b>
-<a>828</a>
-<b>829</b>
-<v>6</v>
-</b>
-<b>
-<a>1443</a>
-<b>1444</b>
-<v>6</v>
-</b>
-<b>
-<a>1582</a>
-<b>1583</b>
-<v>6</v>
-</b>
-<b>
-<a>1908</a>
-<b>1909</b>
-<v>6</v>
-</b>
-<b>
-<a>2445</a>
-<b>2446</b>
-<v>6</v>
-</b>
-<b>
-<a>3327</a>
-<b>3328</b>
-<v>6</v>
-</b>
-<b>
-<a>3570</a>
-<b>3571</b>
-<v>6</v>
-</b>
-<b>
-<a>4942</a>
-<b>4943</b>
-<v>6</v>
-</b>
-<b>
-<a>15732</a>
-<b>15733</b>
-<v>6</v>
-</b>
-<b>
-<a>15997</a>
-<b>15998</b>
-<v>6</v>
-</b>
-<b>
-<a>20983</a>
-<b>20984</b>
-<v>6</v>
-</b>
-<b>
-<a>68504</a>
-<b>68505</b>
-<v>6</v>
-</b>
-<b>
-<a>87453</a>
-<b>87454</b>
-<v>6</v>
-</b>
-<b>
-<a>109229</a>
-<b>109230</b>
-<v>6</v>
-</b>
-<b>
-<a>182456</a>
-<b>182457</b>
-<v>6</v>
-</b>
-<b>
-<a>195155</a>
-<b>195156</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>26</a>
-<b>27</b>
-<v>6</v>
-</b>
-<b>
-<a>414</a>
-<b>415</b>
-<v>6</v>
-</b>
-<b>
-<a>785</a>
-<b>786</b>
-<v>6</v>
-</b>
-<b>
-<a>1053</a>
-<b>1054</b>
-<v>6</v>
-</b>
-<b>
-<a>1285</a>
-<b>1286</b>
-<v>6</v>
-</b>
-<b>
-<a>1329</a>
-<b>1330</b>
-<v>6</v>
-</b>
-<b>
-<a>1370</a>
-<b>1371</b>
-<v>6</v>
-</b>
-<b>
-<a>2027</a>
-<b>2028</b>
-<v>6</v>
-</b>
-<b>
-<a>2301</a>
-<b>2302</b>
-<v>6</v>
-</b>
-<b>
-<a>2430</a>
-<b>2431</b>
-<v>6</v>
-</b>
-<b>
-<a>6908</a>
-<b>6909</b>
-<v>6</v>
-</b>
-<b>
-<a>8367</a>
-<b>8368</b>
-<v>6</v>
-</b>
-<b>
-<a>10976</a>
-<b>10977</b>
-<v>6</v>
-</b>
-<b>
-<a>36004</a>
-<b>36005</b>
-<v>6</v>
-</b>
-<b>
-<a>42618</a>
-<b>42619</b>
-<v>6</v>
-</b>
-<b>
-<a>45224</a>
-<b>45225</b>
-<v>6</v>
-</b>
-<b>
-<a>80548</a>
-<b>80549</b>
-<v>6</v>
-</b>
-<b>
-<a>96139</a>
-<b>96140</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1715650</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>176807</v>
-</b>
-<b>
-<a>4</a>
-<b>1671</b>
-<v>123949</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1952279</v>
-</b>
-<b>
-<a>2</a>
-<b>10</b>
-<v>64128</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>type_vla</name>
-<cardinality>1</cardinality>
-<columnsizes>
-<e>
-<k>type_id</k>
-<v>1</v>
-</e>
-<e>
-<k>decl</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>type_id</src>
-<trg>decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl</src>
-<trg>type_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>variable_vla</name>
-<cardinality>8</cardinality>
-<columnsizes>
-<e>
-<k>var</k>
-<v>8</v>
-</e>
-<e>
-<k>decl</k>
-<v>8</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>var</src>
-<trg>decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl</src>
-<trg>var</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>8</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>if_then</name>
-<cardinality>524673</cardinality>
-<columnsizes>
-<e>
-<k>if_stmt</k>
-<v>524673</v>
-</e>
-<e>
-<k>then_id</k>
-<v>524673</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>if_stmt</src>
-<trg>then_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>524673</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>then_id</src>
-<trg>if_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>524673</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>if_else</name>
-<cardinality>148314</cardinality>
-<columnsizes>
-<e>
-<k>if_stmt</k>
-<v>148314</v>
-</e>
-<e>
-<k>else_id</k>
-<v>148314</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>if_stmt</src>
-<trg>else_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>148314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>else_id</src>
-<trg>if_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>148314</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>constexpr_if_then</name>
-<cardinality>3</cardinality>
-<columnsizes>
-<e>
-<k>constexpr_if_stmt</k>
-<v>3</v>
-</e>
-<e>
-<k>then_id</k>
-<v>3</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>constexpr_if_stmt</src>
-<trg>then_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>then_id</src>
-<trg>constexpr_if_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>constexpr_if_else</name>
-<cardinality>1</cardinality>
-<columnsizes>
-<e>
-<k>constexpr_if_stmt</k>
-<v>1</v>
-</e>
-<e>
-<k>else_id</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>constexpr_if_stmt</src>
-<trg>else_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>else_id</src>
-<trg>constexpr_if_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>while_body</name>
-<cardinality>30641</cardinality>
-<columnsizes>
-<e>
-<k>while_stmt</k>
-<v>30641</v>
-</e>
-<e>
-<k>body_id</k>
-<v>30641</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>while_stmt</src>
-<trg>body_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30641</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>body_id</src>
-<trg>while_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>30641</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>do_body</name>
-<cardinality>149931</cardinality>
-<columnsizes>
-<e>
-<k>do_stmt</k>
-<v>149931</v>
-</e>
-<e>
-<k>body_id</k>
-<v>149931</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>do_stmt</src>
-<trg>body_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>149931</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>body_id</src>
-<trg>do_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>149931</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>switch_case</name>
-<cardinality>271721</cardinality>
-<columnsizes>
-<e>
-<k>switch_stmt</k>
-<v>53308</v>
-</e>
-<e>
-<k>index</k>
-<v>264</v>
-</e>
-<e>
-<k>case_id</k>
-<v>271721</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>switch_stmt</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>5</b>
-<v>4059</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>47188</v>
-</b>
-<b>
-<a>6</a>
-<b>163</b>
-<v>2060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>switch_stmt</src>
-<trg>case_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>5</b>
-<v>4059</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>47188</v>
-</b>
-<b>
-<a>6</a>
-<b>163</b>
-<v>2060</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>switch_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>138</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>22</v>
-</b>
-<b>
-<a>6</a>
-<b>17</b>
-<v>24</v>
-</b>
-<b>
-<a>17</a>
-<b>36</b>
-<v>21</v>
-</b>
-<b>
-<a>36</a>
-<b>86</b>
-<v>21</v>
-</b>
-<b>
-<a>91</a>
-<b>474</b>
-<v>21</v>
-</b>
-<b>
-<a>606</a>
-<b>32709</b>
-<v>14</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>case_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>138</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>22</v>
-</b>
-<b>
-<a>6</a>
-<b>17</b>
-<v>24</v>
-</b>
-<b>
-<a>17</a>
-<b>36</b>
-<v>21</v>
-</b>
-<b>
-<a>36</a>
-<b>86</b>
-<v>21</v>
-</b>
-<b>
-<a>91</a>
-<b>474</b>
-<v>21</v>
-</b>
-<b>
-<a>606</a>
-<b>32709</b>
-<v>14</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>case_id</src>
-<trg>switch_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>271721</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>case_id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>271721</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>switch_body</name>
-<cardinality>53308</cardinality>
-<columnsizes>
-<e>
-<k>switch_stmt</k>
-<v>53308</v>
-</e>
-<e>
-<k>body_id</k>
-<v>53308</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>switch_stmt</src>
-<trg>body_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>53308</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>body_id</src>
-<trg>switch_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>53308</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>for_initialization</name>
-<cardinality>29667</cardinality>
-<columnsizes>
-<e>
-<k>for_stmt</k>
-<v>29667</v>
-</e>
-<e>
-<k>init_id</k>
-<v>29667</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>for_stmt</src>
-<trg>init_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>29667</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>init_id</src>
-<trg>for_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>29667</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>for_condition</name>
-<cardinality>31505</cardinality>
-<columnsizes>
-<e>
-<k>for_stmt</k>
-<v>31505</v>
-</e>
-<e>
-<k>condition_id</k>
-<v>31505</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>for_stmt</src>
-<trg>condition_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31505</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>condition_id</src>
-<trg>for_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>31505</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>for_update</name>
-<cardinality>29407</cardinality>
-<columnsizes>
-<e>
-<k>for_stmt</k>
-<v>29407</v>
-</e>
-<e>
-<k>update_id</k>
-<v>29407</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>for_stmt</src>
-<trg>update_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>29407</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>update_id</src>
-<trg>for_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>29407</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>for_body</name>
-<cardinality>32103</cardinality>
-<columnsizes>
-<e>
-<k>for_stmt</k>
-<v>32103</v>
-</e>
-<e>
-<k>body_id</k>
-<v>32103</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>for_stmt</src>
-<trg>body_id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32103</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>body_id</src>
-<trg>for_stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>32103</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>stmtparents</name>
-<cardinality>4113351</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4113351</v>
-</e>
-<e>
-<k>index</k>
-<v>12615</v>
-</e>
-<e>
-<k>parent</k>
-<v>1738665</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4113351</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4113351</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3962</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1078</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>513</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1474</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>1032</v>
-</b>
-<b>
-<a>8</a>
-<b>12</b>
-<v>818</v>
-</b>
-<b>
-<a>12</a>
-<b>29</b>
-<v>1110</v>
-</b>
-<b>
-<a>29</a>
-<b>37</b>
-<v>896</v>
-</b>
-<b>
-<a>37</a>
-<b>74</b>
-<v>961</v>
-</b>
-<b>
-<a>74</a>
-<b>192180</b>
-<v>766</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>index</src>
-<trg>parent</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3962</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1078</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>513</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1474</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>1032</v>
-</b>
-<b>
-<a>8</a>
-<b>12</b>
-<v>818</v>
-</b>
-<b>
-<a>12</a>
-<b>29</b>
-<v>1110</v>
-</b>
-<b>
-<a>29</a>
-<b>37</b>
-<v>896</v>
-</b>
-<b>
-<a>37</a>
-<b>74</b>
-<v>961</v>
-</b>
-<b>
-<a>74</a>
-<b>192180</b>
-<v>766</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>990323</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>382079</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>108209</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>113841</v>
-</b>
-<b>
-<a>6</a>
-<b>17</b>
-<v>131575</v>
-</b>
-<b>
-<a>17</a>
-<b>1943</b>
-<v>12634</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parent</src>
-<trg>index</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>990323</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>382079</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>108209</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>113841</v>
-</b>
-<b>
-<a>6</a>
-<b>17</b>
-<v>131575</v>
-</b>
-<b>
-<a>17</a>
-<b>1943</b>
-<v>12634</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>ishandler</name>
-<cardinality>21612</cardinality>
-<columnsizes>
-<e>
-<k>block</k>
-<v>21612</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>stmt_decl_bind</name>
-<cardinality>531383</cardinality>
-<columnsizes>
-<e>
-<k>stmt</k>
-<v>524523</v>
-</e>
-<e>
-<k>num</k>
-<v>51</v>
-</e>
-<e>
-<k>decl</k>
-<v>531383</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>stmt</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>519092</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>5430</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>stmt</src>
-<trg>decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>519073</v>
-</b>
-<b>
-<a>2</a>
-<b>9</b>
-<v>5450</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>6</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>6</v>
-</b>
-<b>
-<a>24</a>
-<b>25</b>
-<v>6</v>
-</b>
-<b>
-<a>172</a>
-<b>173</b>
-<v>6</v>
-</b>
-<b>
-<a>836</a>
-<b>837</b>
-<v>6</v>
-</b>
-<b>
-<a>80746</a>
-<b>80747</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>decl</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>6</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>6</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>6</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
-<v>6</v>
-</b>
-<b>
-<a>24</a>
-<b>25</b>
-<v>6</v>
-</b>
-<b>
-<a>172</a>
-<b>173</b>
-<v>6</v>
-</b>
-<b>
-<a>836</a>
-<b>837</b>
-<v>6</v>
-</b>
-<b>
-<a>80749</a>
-<b>80750</b>
-<v>6</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl</src>
-<trg>stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>531383</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>531383</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>stmt_decl_entry_bind</name>
-<cardinality>498005</cardinality>
-<columnsizes>
-<e>
-<k>stmt</k>
-<v>454241</v>
-</e>
-<e>
-<k>num</k>
-<v>444</v>
-</e>
-<e>
-<k>decl_entry</k>
-<v>474016</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>stmt</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>422673</v>
-</b>
-<b>
-<a>2</a>
-<b>274</b>
-<v>31568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>stmt</src>
-<trg>decl_entry</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>422673</v>
-</b>
-<b>
-<a>2</a>
-<b>15</b>
-<v>31568</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>6</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>213</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>1</v>
-</b>
-<b>
-<a>15</a>
-<b>16</b>
-<v>190</v>
-</b>
-<b>
-<a>17</a>
-<b>278706</b>
-<v>32</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>num</src>
-<trg>decl_entry</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>8</a>
-<b>9</b>
-<v>6</v>
-</b>
-<b>
-<a>11</a>
-<b>12</b>
-<v>213</v>
-</b>
-<b>
-<a>13</a>
-<b>14</b>
-<v>190</v>
-</b>
-<b>
-<a>15</a>
-<b>267734</b>
-<v>34</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl_entry</src>
-<trg>stmt</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>462337</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>11679</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>decl_entry</src>
-<trg>num</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>473936</v>
-</b>
-<b>
-<a>2</a>
-<b>273</b>
-<v>79</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>blockscope</name>
-<cardinality>1309621</cardinality>
-<columnsizes>
-<e>
-<k>block</k>
-<v>1309621</v>
-</e>
-<e>
-<k>enclosing</k>
-<v>1173021</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>block</src>
-<trg>enclosing</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1309621</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>enclosing</src>
-<trg>block</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1093573</v>
-</b>
-<b>
-<a>2</a>
-<b>509</b>
-<v>79447</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>jumpinfo</name>
-<cardinality>351037</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>351037</v>
-</e>
-<e>
-<k>str</k>
-<v>5914</v>
-</e>
-<e>
-<k>target</k>
-<v>81577</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>str</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>351037</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>target</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>351037</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>str</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3212</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>796</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>686</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>487</v>
-</b>
-<b>
-<a>7</a>
-<b>15</b>
-<v>459</v>
-</b>
-<b>
-<a>15</a>
-<b>181398</b>
-<v>272</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>str</src>
-<trg>target</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4703</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>674</v>
-</b>
-<b>
-<a>3</a>
-<b>12</b>
-<v>456</v>
-</b>
-<b>
-<a>12</a>
-<b>38931</b>
-<v>79</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>target</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>254</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>19879</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>7102</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>3572</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>38447</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>10579</v>
-</b>
-<b>
-<a>7</a>
-<b>166</b>
-<v>1742</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>target</src>
-<trg>str</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>81577</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>preprocdirects</name>
-<cardinality>1308115</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1308115</v>
-</e>
-<e>
-<k>kind</k>
-<v>140</v>
-</e>
-<e>
-<k>location</k>
-<v>1301872</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1308115</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1308115</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>10</v>
-</b>
-<b>
-<a>500</a>
-<b>501</b>
-<v>10</v>
-</b>
-<b>
-<a>967</a>
-<b>968</b>
-<v>10</v>
-</b>
-<b>
-<a>1755</a>
-<b>1756</b>
-<v>10</v>
-</b>
-<b>
-<a>1881</a>
-<b>1882</b>
-<v>10</v>
-</b>
-<b>
-<a>5258</a>
-<b>5259</b>
-<v>10</v>
-</b>
-<b>
-<a>5570</a>
-<b>5571</b>
-<v>10</v>
-</b>
-<b>
-<a>7598</a>
-<b>7599</b>
-<v>10</v>
-</b>
-<b>
-<a>14233</a>
-<b>14234</b>
-<v>10</v>
-</b>
-<b>
-<a>26512</a>
-<b>26513</b>
-<v>10</v>
-</b>
-<b>
-<a>27401</a>
-<b>27402</b>
-<v>10</v>
-</b>
-<b>
-<a>29002</a>
-<b>29003</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>kind</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>10</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>10</v>
-</b>
-<b>
-<a>500</a>
-<b>501</b>
-<v>10</v>
-</b>
-<b>
-<a>967</a>
-<b>968</b>
-<v>10</v>
-</b>
-<b>
-<a>1755</a>
-<b>1756</b>
-<v>10</v>
-</b>
-<b>
-<a>1881</a>
-<b>1882</b>
-<v>10</v>
-</b>
-<b>
-<a>5258</a>
-<b>5259</b>
-<v>10</v>
-</b>
-<b>
-<a>5570</a>
-<b>5571</b>
-<v>10</v>
-</b>
-<b>
-<a>7598</a>
-<b>7599</b>
-<v>10</v>
-</b>
-<b>
-<a>14233</a>
-<b>14234</b>
-<v>10</v>
-</b>
-<b>
-<a>26170</a>
-<b>26171</b>
-<v>10</v>
-</b>
-<b>
-<a>27401</a>
-<b>27402</b>
-<v>10</v>
-</b>
-<b>
-<a>28769</a>
-<b>28770</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1301546</v>
-</b>
-<b>
-<a>2</a>
-<b>235</b>
-<v>325</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>kind</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1301872</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>preprocpair</name>
-<cardinality>374369</cardinality>
-<columnsizes>
-<e>
-<k>begin</k>
-<v>296991</v>
-</e>
-<e>
-<k>elseelifend</k>
-<v>374369</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>begin</src>
-<trg>elseelifend</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>235829</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>53911</v>
-</b>
-<b>
-<a>3</a>
-<b>53</b>
-<v>7251</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elseelifend</src>
-<trg>begin</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>374369</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>preproctrue</name>
-<cardinality>164618</cardinality>
-<columnsizes>
-<e>
-<k>branch</k>
-<v>164618</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>preprocfalse</name>
-<cardinality>117730</cardinality>
-<columnsizes>
-<e>
-<k>branch</k>
-<v>117730</v>
-</e>
-</columnsizes>
-<dependencies/>
-</relation>
-<relation>
-<name>preproctext</name>
-<cardinality>954122</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>954122</v>
-</e>
-<e>
-<k>head</k>
-<v>458142</v>
-</e>
-<e>
-<k>body</k>
-<v>173528</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>head</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>954122</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>body</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>954122</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>head</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>341918</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>77258</v>
-</b>
-<b>
-<a>3</a>
-<b>19</b>
-<v>34369</v>
-</b>
-<b>
-<a>19</a>
-<b>752</b>
-<v>4595</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>head</src>
-<trg>body</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>436714</v>
-</b>
-<b>
-<a>2</a>
-<b>38</b>
-<v>21428</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>body</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>163079</v>
-</b>
-<b>
-<a>2</a>
-<b>64816</b>
-<v>10448</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>body</src>
-<trg>head</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>164542</v>
-</b>
-<b>
-<a>2</a>
-<b>21810</b>
-<v>8985</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>includes</name>
-<cardinality>287443</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>287443</v>
-</e>
-<e>
-<k>included</k>
-<v>53966</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>included</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>287443</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>included</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26576</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>8855</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>4563</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>4790</v>
-</b>
-<b>
-<a>6</a>
-<b>11</b>
-<v>4140</v>
-</b>
-<b>
-<a>11</a>
-<b>41</b>
-<v>4064</v>
-</b>
-<b>
-<a>41</a>
-<b>763</b>
-<v>975</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>link_targets</name>
-<cardinality>574</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>574</v>
-</e>
-<e>
-<k>binary</k>
-<v>574</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>binary</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>574</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>binary</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>574</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>link_parent</name>
-<cardinality>18584884</cardinality>
-<columnsizes>
-<e>
-<k>element</k>
-<v>5164827</v>
-</e>
-<e>
-<k>link_target</k>
-<v>574</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>element</src>
-<trg>link_target</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1543684</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1943264</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>754223</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>422385</v>
-</b>
-<b>
-<a>6</a>
-<b>29</b>
-<v>402680</v>
-</b>
-<b>
-<a>29</a>
-<b>45</b>
-<v>98589</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>link_target</src>
-<trg>element</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>86</v>
-</b>
-<b>
-<a>5</a>
-<b>559</b>
-<v>43</v>
-</b>
-<b>
-<a>2834</a>
-<b>6256</b>
-<v>43</v>
-</b>
-<b>
-<a>6663</a>
-<b>8713</b>
-<v>43</v>
-</b>
-<b>
-<a>10268</a>
-<b>13146</b>
-<v>43</v>
-</b>
-<b>
-<a>13433</a>
-<b>20518</b>
-<v>43</v>
-</b>
-<b>
-<a>25549</a>
-<b>27566</b>
-<v>43</v>
-</b>
-<b>
-<a>27680</a>
-<b>33162</b>
-<v>43</v>
-</b>
-<b>
-<a>34917</a>
-<b>40444</b>
-<v>43</v>
-</b>
-<b>
-<a>42525</a>
-<b>46022</b>
-<v>43</v>
-</b>
-<b>
-<a>47794</a>
-<b>58086</b>
-<v>43</v>
-</b>
-<b>
-<a>58594</a>
-<b>139377</b>
-<v>43</v>
-</b>
-<b>
-<a>388296</a>
-<b>388297</b>
-<v>10</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlEncoding</name>
-<cardinality>39724</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>39724</v>
-</e>
-<e>
-<k>encoding</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>encoding</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>39724</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>encoding</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>39724</a>
-<b>39725</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlDTDs</name>
-<cardinality>1</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1</v>
-</e>
-<e>
-<k>root</k>
-<v>1</v>
-</e>
-<e>
-<k>publicId</k>
-<v>1</v>
-</e>
-<e>
-<k>systemId</k>
-<v>1</v>
-</e>
-<e>
-<k>fileid</k>
-<v>1</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>root</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>publicId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>systemId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>root</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>root</src>
-<trg>publicId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>root</src>
-<trg>systemId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>root</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>publicId</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>publicId</src>
-<trg>root</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>publicId</src>
-<trg>systemId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>publicId</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>systemId</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>systemId</src>
-<trg>root</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>systemId</src>
-<trg>publicId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>systemId</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>root</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>publicId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>systemId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlElements</name>
-<cardinality>1270313</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1270313</v>
-</e>
-<e>
-<k>name</k>
-<v>4655</v>
-</e>
-<e>
-<k>parentid</k>
-<v>578021</v>
-</e>
-<e>
-<k>idx</k>
-<v>35122</v>
-</e>
-<e>
-<k>fileid</k>
-<v>39721</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1270313</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1270313</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1270313</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1270313</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>420</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>156</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3832</v>
-</b>
-<b>
-<a>6</a>
-<b>310317</b>
-<v>247</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>456</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>150</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3829</v>
-</b>
-<b>
-<a>6</a>
-<b>161565</b>
-<v>220</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4358</v>
-</b>
-<b>
-<a>2</a>
-<b>35123</b>
-<v>297</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>486</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>133</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3831</v>
-</b>
-<b>
-<a>6</a>
-<b>14503</b>
-<v>205</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>371969</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>62095</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>104113</v>
-</b>
-<b>
-<a>4</a>
-<b>35123</b>
-<v>39844</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>500482</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>17866</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>49117</v>
-</b>
-<b>
-<a>4</a>
-<b>45</b>
-<v>10556</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>371969</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>62095</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>104113</v>
-</b>
-<b>
-<a>4</a>
-<b>35123</b>
-<v>39844</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>578021</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>606</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>17851</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>6533</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>859</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>4471</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>2719</v>
-</b>
-<b>
-<a>16</a>
-<b>578022</b>
-<v>2083</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18457</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>6533</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>6178</v>
-</b>
-<b>
-<a>4</a>
-<b>8</b>
-<v>2624</v>
-</b>
-<b>
-<a>8</a>
-<b>4397</b>
-<v>1330</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>606</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>17851</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>6533</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>859</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>4471</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>2719</v>
-</b>
-<b>
-<a>16</a>
-<b>578022</b>
-<v>2083</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>2</a>
-<b>3</b>
-<v>606</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>17851</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>6533</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>859</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>4471</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>2719</v>
-</b>
-<b>
-<a>16</a>
-<b>39722</b>
-<v>2083</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>20457</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3115</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>3026</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>3588</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>2220</v>
-</b>
-<b>
-<a>9</a>
-<b>11</b>
-<v>3099</v>
-</b>
-<b>
-<a>11</a>
-<b>19</b>
-<v>3087</v>
-</b>
-<b>
-<a>19</a>
-<b>114506</b>
-<v>1129</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>20459</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3458</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>2569</v>
-</b>
-<b>
-<a>5</a>
-<b>7</b>
-<v>2172</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>6158</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>3501</v>
-</b>
-<b>
-<a>9</a>
-<b>46</b>
-<v>1404</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>20457</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>3870</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>2152</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>2876</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>2720</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>4132</v>
-</b>
-<b>
-<a>8</a>
-<b>14</b>
-<v>3096</v>
-</b>
-<b>
-<a>14</a>
-<b>31079</b>
-<v>418</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>25894</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>5301</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>3787</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>3268</v>
-</b>
-<b>
-<a>6</a>
-<b>35123</b>
-<v>1471</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlAttrs</name>
-<cardinality>1202020</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>1202020</v>
-</e>
-<e>
-<k>elementid</k>
-<v>760198</v>
-</e>
-<e>
-<k>name</k>
-<v>3649</v>
-</e>
-<e>
-<k>value</k>
-<v>121803</v>
-</e>
-<e>
-<k>idx</k>
-<v>2000</v>
-</e>
-<e>
-<k>fileid</k>
-<v>39448</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>elementid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1202020</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1202020</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1202020</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1202020</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1202020</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elementid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>425697</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>249659</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>66474</v>
-</b>
-<b>
-<a>4</a>
-<b>2001</b>
-<v>18368</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elementid</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>425778</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>249579</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>66475</v>
-</b>
-<b>
-<a>4</a>
-<b>2001</b>
-<v>18366</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elementid</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>466237</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>266291</v>
-</b>
-<b>
-<a>3</a>
-<b>46</b>
-<v>27670</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elementid</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>425697</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>249659</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>66474</v>
-</b>
-<b>
-<a>4</a>
-<b>2001</b>
-<v>18368</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elementid</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>760198</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3467</v>
-</b>
-<b>
-<a>2</a>
-<b>262475</b>
-<v>182</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>elementid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3467</v>
-</b>
-<b>
-<a>2</a>
-<b>262475</b>
-<v>182</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3501</v>
-</b>
-<b>
-<a>2</a>
-<b>54146</b>
-<v>148</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3531</v>
-</b>
-<b>
-<a>2</a>
-<b>11</b>
-<v>118</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>name</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3491</v>
-</b>
-<b>
-<a>2</a>
-<b>21768</b>
-<v>158</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>72032</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>42366</v>
-</b>
-<b>
-<a>3</a>
-<b>199269</b>
-<v>7405</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>elementid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>72036</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>42374</v>
-</b>
-<b>
-<a>3</a>
-<b>199269</b>
-<v>7393</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>116722</v>
-</b>
-<b>
-<a>2</a>
-<b>2041</b>
-<v>5081</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>117957</v>
-</b>
-<b>
-<a>2</a>
-<b>2001</b>
-<v>3846</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>value</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>86306</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>28570</v>
-</b>
-<b>
-<a>3</a>
-<b>4175</b>
-<v>6927</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1955</v>
-</b>
-<b>
-<a>2</a>
-<b>760199</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>elementid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1955</v>
-</b>
-<b>
-<a>2</a>
-<b>760199</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1955</v>
-</b>
-<b>
-<a>2</a>
-<b>189</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1955</v>
-</b>
-<b>
-<a>2</a>
-<b>116643</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1955</v>
-</b>
-<b>
-<a>2</a>
-<b>39449</b>
-<v>45</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>22884</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>2565</v>
-</b>
-<b>
-<a>4</a>
-<b>6</b>
-<v>2294</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>3299</v>
-</b>
-<b>
-<a>7</a>
-<b>9</b>
-<v>3272</v>
-</b>
-<b>
-<a>9</a>
-<b>16</b>
-<v>3143</v>
-</b>
-<b>
-<a>16</a>
-<b>129952</b>
-<v>1991</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>elementid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>23890</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>2131</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1971</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>4096</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>3519</v>
-</b>
-<b>
-<a>8</a>
-<b>16</b>
-<v>3137</v>
-</b>
-<b>
-<a>16</a>
-<b>106600</b>
-<v>704</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>name</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>22946</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>2338</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>2726</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>2824</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>2994</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>3876</v>
-</b>
-<b>
-<a>7</a>
-<b>2002</b>
-<v>1744</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>value</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>22916</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>2772</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>2112</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3510</v>
-</b>
-<b>
-<a>6</a>
-<b>8</b>
-<v>1993</v>
-</b>
-<b>
-<a>8</a>
-<b>11</b>
-<v>3365</v>
-</b>
-<b>
-<a>11</a>
-<b>50357</b>
-<v>2780</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26133</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>9699</v>
-</b>
-<b>
-<a>3</a>
-<b>5</b>
-<v>3511</v>
-</b>
-<b>
-<a>5</a>
-<b>2001</b>
-<v>105</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlNs</name>
-<cardinality>71201</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>4185</v>
-</e>
-<e>
-<k>prefixName</k>
-<v>958</v>
-</e>
-<e>
-<k>URI</k>
-<v>4185</v>
-</e>
-<e>
-<k>fileid</k>
-<v>39544</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>prefixName</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2602</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1553</v>
-</b>
-<b>
-<a>3</a>
-<b>872</b>
-<v>30</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>URI</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4185</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>6</b>
-<v>274</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>3825</v>
-</b>
-<b>
-<a>7</a>
-<b>24905</b>
-<v>86</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>prefixName</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>915</v>
-</b>
-<b>
-<a>2</a>
-<b>4054</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>prefixName</src>
-<trg>URI</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>915</v>
-</b>
-<b>
-<a>2</a>
-<b>4054</b>
-<v>43</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>prefixName</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>828</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>73</v>
-</b>
-<b>
-<a>5</a>
-<b>24903</b>
-<v>57</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>URI</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4185</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>URI</src>
-<trg>prefixName</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2602</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1553</v>
-</b>
-<b>
-<a>3</a>
-<b>872</b>
-<v>30</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>URI</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>6</b>
-<v>274</v>
-</b>
-<b>
-<a>6</a>
-<b>7</b>
-<v>3825</v>
-</b>
-<b>
-<a>7</a>
-<b>24905</b>
-<v>86</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11655</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>26146</v>
-</b>
-<b>
-<a>3</a>
-<b>8</b>
-<v>1743</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>prefixName</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11653</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>25982</v>
-</b>
-<b>
-<a>3</a>
-<b>31</b>
-<v>1909</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>URI</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>11655</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>26146</v>
-</b>
-<b>
-<a>3</a>
-<b>8</b>
-<v>1743</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlHasNs</name>
-<cardinality>1139730</cardinality>
-<columnsizes>
-<e>
-<k>elementId</k>
-<v>1139730</v>
-</e>
-<e>
-<k>nsId</k>
-<v>4136</v>
-</e>
-<e>
-<k>fileid</k>
-<v>39537</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>elementId</src>
-<trg>nsId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1139730</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>elementId</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1139730</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>nsId</src>
-<trg>elementId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>5</b>
-<v>234</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3824</v>
-</b>
-<b>
-<a>6</a>
-<b>643289</b>
-<v>78</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>nsId</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>5</b>
-<v>257</v>
-</b>
-<b>
-<a>5</a>
-<b>6</b>
-<v>3823</v>
-</b>
-<b>
-<a>6</a>
-<b>24759</b>
-<v>56</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>elementId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3669</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>20429</v>
-</b>
-<b>
-<a>3</a>
-<b>7</b>
-<v>2536</v>
-</b>
-<b>
-<a>7</a>
-<b>8</b>
-<v>3473</v>
-</b>
-<b>
-<a>8</a>
-<b>9</b>
-<v>2258</v>
-</b>
-<b>
-<a>9</a>
-<b>11</b>
-<v>3036</v>
-</b>
-<b>
-<a>11</a>
-<b>18</b>
-<v>2966</v>
-</b>
-<b>
-<a>18</a>
-<b>147552</b>
-<v>1170</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>nsId</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>18261</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>21032</v>
-</b>
-<b>
-<a>3</a>
-<b>8</b>
-<v>244</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlComments</name>
-<cardinality>26812</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>26812</v>
-</e>
-<e>
-<k>text</k>
-<v>22933</v>
-</e>
-<e>
-<k>parentid</k>
-<v>26546</v>
-</e>
-<e>
-<k>fileid</k>
-<v>26368</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26812</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26812</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26812</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21517</v>
-</b>
-<b>
-<a>2</a>
-<b>62</b>
-<v>1416</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21519</v>
-</b>
-<b>
-<a>2</a>
-<b>62</b>
-<v>1414</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>21522</v>
-</b>
-<b>
-<a>2</a>
-<b>62</b>
-<v>1411</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26379</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>167</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26379</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>167</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26546</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26161</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>207</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26165</v>
-</b>
-<b>
-<a>2</a>
-<b>17</b>
-<v>203</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26223</v>
-</b>
-<b>
-<a>2</a>
-<b>10</b>
-<v>145</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmlChars</name>
-<cardinality>439958</cardinality>
-<columnsizes>
-<e>
-<k>id</k>
-<v>439958</v>
-</e>
-<e>
-<k>text</k>
-<v>100518</v>
-</e>
-<e>
-<k>parentid</k>
-<v>433851</v>
-</e>
-<e>
-<k>idx</k>
-<v>4</v>
-</e>
-<e>
-<k>isCDATA</k>
-<v>1</v>
-</e>
-<e>
-<k>fileid</k>
-<v>26494</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>id</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>439958</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>439958</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>439958</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>isCDATA</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>439958</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>id</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>439958</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>60389</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>3811</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>29257</v>
-</b>
-<b>
-<a>5</a>
-<b>23171</b>
-<v>7061</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>60389</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>3811</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>29257</v>
-</b>
-<b>
-<a>5</a>
-<b>23171</b>
-<v>7061</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>100517</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>isCDATA</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>100518</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>text</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>61284</v>
-</b>
-<b>
-<a>2</a>
-<b>4</b>
-<v>4205</v>
-</b>
-<b>
-<a>4</a>
-<b>5</b>
-<v>28328</v>
-</b>
-<b>
-<a>5</a>
-<b>351</b>
-<v>6701</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>429716</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>4135</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>429716</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>4135</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>429716</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>4135</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>isCDATA</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>433851</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>parentid</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>433851</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>80</a>
-<b>81</b>
-<v>1</v>
-</b>
-<b>
-<a>1892</a>
-<b>1893</b>
-<v>1</v>
-</b>
-<b>
-<a>4135</a>
-<b>4136</b>
-<v>1</v>
-</b>
-<b>
-<a>433851</a>
-<b>433852</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>1</v>
-</b>
-<b>
-<a>3</a>
-<b>4</b>
-<v>1</v>
-</b>
-<b>
-<a>16</a>
-<b>17</b>
-<v>1</v>
-</b>
-<b>
-<a>100499</a>
-<b>100500</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>80</a>
-<b>81</b>
-<v>1</v>
-</b>
-<b>
-<a>1892</a>
-<b>1893</b>
-<v>1</v>
-</b>
-<b>
-<a>4135</a>
-<b>4136</b>
-<v>1</v>
-</b>
-<b>
-<a>433851</a>
-<b>433852</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>isCDATA</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>4</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>idx</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1</v>
-</b>
-<b>
-<a>46</a>
-<b>47</b>
-<v>1</v>
-</b>
-<b>
-<a>97</a>
-<b>98</b>
-<v>1</v>
-</b>
-<b>
-<a>26494</a>
-<b>26495</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>isCDATA</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>439958</a>
-<b>439959</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>isCDATA</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>100518</a>
-<b>100519</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>isCDATA</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>433851</a>
-<b>433852</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>isCDATA</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>4</a>
-<b>5</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>isCDATA</src>
-<trg>fileid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>26494</a>
-<b>26495</b>
-<v>1</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>id</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>25303</v>
-</b>
-<b>
-<a>2</a>
-<b>35123</b>
-<v>1191</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>text</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>25765</v>
-</b>
-<b>
-<a>2</a>
-<b>35123</b>
-<v>729</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>parentid</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>25312</v>
-</b>
-<b>
-<a>2</a>
-<b>35123</b>
-<v>1182</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>idx</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26397</v>
-</b>
-<b>
-<a>2</a>
-<b>5</b>
-<v>97</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>fileid</src>
-<trg>isCDATA</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>26494</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-<relation>
-<name>xmllocations</name>
-<cardinality>3051056</cardinality>
-<columnsizes>
-<e>
-<k>xmlElement</k>
-<v>2982460</v>
-</e>
-<e>
-<k>location</k>
-<v>3051056</v>
-</e>
-</columnsizes>
-<dependencies>
-<dep>
-<src>xmlElement</src>
-<trg>location</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>2978326</v>
-</b>
-<b>
-<a>2</a>
-<b>24903</b>
-<v>4134</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-<dep>
-<src>location</src>
-<trg>xmlElement</trg>
-<val>
-<hist>
-<budget>12</budget>
-<bs>
-<b>
-<a>1</a>
-<b>2</b>
-<v>3051056</v>
-</b>
-</bs>
-</hist>
-</val>
-</dep>
-</dependencies>
-</relation>
-</stats>
+    <typesizes>
+        <e>
+            <k>@compilation</k>
+            <v>9999</v>
+        </e>
+        <e>
+            <k>@externalDataElement</k>
+            <v>65</v>
+        </e>
+        <e>
+            <k>@external_package</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@svnentry</k>
+            <v>575525</v>
+        </e>
+        <e>
+            <k>@location_stmt</k>
+            <v>3805195</v>
+        </e>
+        <e>
+            <k>@location_default</k>
+            <v>30199622</v>
+        </e>
+        <e>
+            <k>@location_expr</k>
+            <v>13127189</v>
+        </e>
+        <e>
+            <k>@diagnostic</k>
+            <v>667106</v>
+        </e>
+        <e>
+            <k>@file</k>
+            <v>124610</v>
+        </e>
+        <e>
+            <k>@folder</k>
+            <v>15576</v>
+        </e>
+        <e>
+            <k>@macroinvocation</k>
+            <v>34062185</v>
+        </e>
+        <e>
+            <k>@function</k>
+            <v>4759741</v>
+        </e>
+        <e>
+            <k>@fun_decl</k>
+            <v>5131684</v>
+        </e>
+        <e>
+            <k>@type_decl</k>
+            <v>3292736</v>
+        </e>
+        <e>
+            <k>@namespace_decl</k>
+            <v>307863</v>
+        </e>
+        <e>
+            <k>@using</k>
+            <v>375719</v>
+        </e>
+        <e>
+            <k>@static_assert</k>
+            <v>130790</v>
+        </e>
+        <e>
+            <k>@var_decl</k>
+            <v>8586319</v>
+        </e>
+        <e>
+            <k>@parameter</k>
+            <v>6696867</v>
+        </e>
+        <e>
+            <k>@membervariable</k>
+            <v>1050009</v>
+        </e>
+        <e>
+            <k>@globalvariable</k>
+            <v>300708</v>
+        </e>
+        <e>
+            <k>@localvariable</k>
+            <v>581746</v>
+        </e>
+        <e>
+            <k>@enumconstant</k>
+            <v>240596</v>
+        </e>
+        <e>
+            <k>@builtintype</k>
+            <v>22184</v>
+        </e>
+        <e>
+            <k>@derivedtype</k>
+            <v>4456239</v>
+        </e>
+        <e>
+            <k>@decltype</k>
+            <v>31152</v>
+        </e>
+        <e>
+            <k>@usertype</k>
+            <v>5362968</v>
+        </e>
+        <e>
+            <k>@mangledname</k>
+            <v>1733994</v>
+        </e>
+        <e>
+            <k>@type_mention</k>
+            <v>4011226</v>
+        </e>
+        <e>
+            <k>@routinetype</k>
+            <v>543059</v>
+        </e>
+        <e>
+            <k>@ptrtomember</k>
+            <v>38232</v>
+        </e>
+        <e>
+            <k>@specifier</k>
+            <v>25016</v>
+        </e>
+        <e>
+            <k>@gnuattribute</k>
+            <v>663644</v>
+        </e>
+        <e>
+            <k>@stdattribute</k>
+            <v>468476</v>
+        </e>
+        <e>
+            <k>@alignas</k>
+            <v>8968</v>
+        </e>
+        <e>
+            <k>@declspec</k>
+            <v>238528</v>
+        </e>
+        <e>
+            <k>@msattribute</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@attribute_arg_token</k>
+            <v>25960</v>
+        </e>
+        <e>
+            <k>@attribute_arg_constant</k>
+            <v>324742</v>
+        </e>
+        <e>
+            <k>@attribute_arg_type</k>
+            <v>1535</v>
+        </e>
+        <e>
+            <k>@attribute_arg_empty</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@derivation</k>
+            <v>397280</v>
+        </e>
+        <e>
+            <k>@frienddecl</k>
+            <v>710038</v>
+        </e>
+        <e>
+            <k>@comment</k>
+            <v>9024167</v>
+        </e>
+        <e>
+            <k>@namespace</k>
+            <v>12744</v>
+        </e>
+        <e>
+            <k>@specialnamequalifyingelement</k>
+            <v>472</v>
+        </e>
+        <e>
+            <k>@namequalifier</k>
+            <v>1593457</v>
+        </e>
+        <e>
+            <k>@value</k>
+            <v>10645398</v>
+        </e>
+        <e>
+            <k>@initialiser</k>
+            <v>1736804</v>
+        </e>
+        <e>
+            <k>@delete_array_expr</k>
+            <v>1413</v>
+        </e>
+        <e>
+            <k>@new_array_expr</k>
+            <v>5113</v>
+        </e>
+        <e>
+            <k>@ctordirectinit</k>
+            <v>111984</v>
+        </e>
+        <e>
+            <k>@ctorvirtualinit</k>
+            <v>6546</v>
+        </e>
+        <e>
+            <k>@ctorfieldinit</k>
+            <v>199374</v>
+        </e>
+        <e>
+            <k>@ctordelegatinginit</k>
+            <v>7857</v>
+        </e>
+        <e>
+            <k>@dtordirectdestruct</k>
+            <v>41421</v>
+        </e>
+        <e>
+            <k>@dtorvirtualdestruct</k>
+            <v>4093</v>
+        </e>
+        <e>
+            <k>@dtorfielddestruct</k>
+            <v>41351</v>
+        </e>
+        <e>
+            <k>@static_cast</k>
+            <v>212170</v>
+        </e>
+        <e>
+            <k>@reinterpret_cast</k>
+            <v>30881</v>
+        </e>
+        <e>
+            <k>@const_cast</k>
+            <v>35398</v>
+        </e>
+        <e>
+            <k>@c_style_cast</k>
+            <v>4209375</v>
+        </e>
+        <e>
+            <k>@lambdaexpr</k>
+            <v>21712</v>
+        </e>
+        <e>
+            <k>@param_ref</k>
+            <v>403726</v>
+        </e>
+        <e>
+            <k>@errorexpr</k>
+            <v>54470</v>
+        </e>
+        <e>
+            <k>@address_of</k>
+            <v>438806</v>
+        </e>
+        <e>
+            <k>@reference_to</k>
+            <v>1615323</v>
+        </e>
+        <e>
+            <k>@indirect</k>
+            <v>292094</v>
+        </e>
+        <e>
+            <k>@ref_indirect</k>
+            <v>1941936</v>
+        </e>
+        <e>
+            <k>@array_to_pointer</k>
+            <v>1424786</v>
+        </e>
+        <e>
+            <k>@vacuous_destructor_call</k>
+            <v>8711</v>
+        </e>
+        <e>
+            <k>@parexpr</k>
+            <v>3572304</v>
+        </e>
+        <e>
+            <k>@arithnegexpr</k>
+            <v>650877</v>
+        </e>
+        <e>
+            <k>@unaryplusexpr</k>
+            <v>2903</v>
+        </e>
+        <e>
+            <k>@complementexpr</k>
+            <v>27785</v>
+        </e>
+        <e>
+            <k>@notexpr</k>
+            <v>277973</v>
+        </e>
+        <e>
+            <k>@postincrexpr</k>
+            <v>61769</v>
+        </e>
+        <e>
+            <k>@postdecrexpr</k>
+            <v>41857</v>
+        </e>
+        <e>
+            <k>@preincrexpr</k>
+            <v>70302</v>
+        </e>
+        <e>
+            <k>@predecrexpr</k>
+            <v>26107</v>
+        </e>
+        <e>
+            <k>@conditionalexpr</k>
+            <v>654457</v>
+        </e>
+        <e>
+            <k>@addexpr</k>
+            <v>400330</v>
+        </e>
+        <e>
+            <k>@subexpr</k>
+            <v>339317</v>
+        </e>
+        <e>
+            <k>@mulexpr</k>
+            <v>305870</v>
+        </e>
+        <e>
+            <k>@divexpr</k>
+            <v>133721</v>
+        </e>
+        <e>
+            <k>@remexpr</k>
+            <v>15707</v>
+        </e>
+        <e>
+            <k>@paddexpr</k>
+            <v>86499</v>
+        </e>
+        <e>
+            <k>@psubexpr</k>
+            <v>49678</v>
+        </e>
+        <e>
+            <k>@pdiffexpr</k>
+            <v>35608</v>
+        </e>
+        <e>
+            <k>@lshiftexpr</k>
+            <v>562948</v>
+        </e>
+        <e>
+            <k>@rshiftexpr</k>
+            <v>141607</v>
+        </e>
+        <e>
+            <k>@andexpr</k>
+            <v>491783</v>
+        </e>
+        <e>
+            <k>@orexpr</k>
+            <v>146257</v>
+        </e>
+        <e>
+            <k>@xorexpr</k>
+            <v>53934</v>
+        </e>
+        <e>
+            <k>@eqexpr</k>
+            <v>468840</v>
+        </e>
+        <e>
+            <k>@neexpr</k>
+            <v>300391</v>
+        </e>
+        <e>
+            <k>@gtexpr</k>
+            <v>101009</v>
+        </e>
+        <e>
+            <k>@ltexpr</k>
+            <v>108562</v>
+        </e>
+        <e>
+            <k>@geexpr</k>
+            <v>58985</v>
+        </e>
+        <e>
+            <k>@leexpr</k>
+            <v>212126</v>
+        </e>
+        <e>
+            <k>@assignexpr</k>
+            <v>933354</v>
+        </e>
+        <e>
+            <k>@assignaddexpr</k>
+            <v>68222</v>
+        </e>
+        <e>
+            <k>@assignsubexpr</k>
+            <v>15624</v>
+        </e>
+        <e>
+            <k>@assignmulexpr</k>
+            <v>7586</v>
+        </e>
+        <e>
+            <k>@assigndivexpr</k>
+            <v>4971</v>
+        </e>
+        <e>
+            <k>@assignremexpr</k>
+            <v>1625</v>
+        </e>
+        <e>
+            <k>@assignlshiftexpr</k>
+            <v>2704</v>
+        </e>
+        <e>
+            <k>@assignrshiftexpr</k>
+            <v>4495</v>
+        </e>
+        <e>
+            <k>@assignandexpr</k>
+            <v>5780</v>
+        </e>
+        <e>
+            <k>@assignorexpr</k>
+            <v>23853</v>
+        </e>
+        <e>
+            <k>@assignxorexpr</k>
+            <v>21802</v>
+        </e>
+        <e>
+            <k>@assignpaddexpr</k>
+            <v>13576</v>
+        </e>
+        <e>
+            <k>@assignpsubexpr</k>
+            <v>1148</v>
+        </e>
+        <e>
+            <k>@andlogicalexpr</k>
+            <v>248991</v>
+        </e>
+        <e>
+            <k>@orlogicalexpr</k>
+            <v>863957</v>
+        </e>
+        <e>
+            <k>@commaexpr</k>
+            <v>181070</v>
+        </e>
+        <e>
+            <k>@subscriptexpr</k>
+            <v>367945</v>
+        </e>
+        <e>
+            <k>@callexpr</k>
+            <v>310110</v>
+        </e>
+        <e>
+            <k>@vastartexpr</k>
+            <v>3713</v>
+        </e>
+        <e>
+            <k>@vaendexpr</k>
+            <v>2832</v>
+        </e>
+        <e>
+            <k>@varaccess</k>
+            <v>6005942</v>
+        </e>
+        <e>
+            <k>@thisaccess</k>
+            <v>1129204</v>
+        </e>
+        <e>
+            <k>@new_expr</k>
+            <v>55240</v>
+        </e>
+        <e>
+            <k>@delete_expr</k>
+            <v>11649</v>
+        </e>
+        <e>
+            <k>@throw_expr</k>
+            <v>21806</v>
+        </e>
+        <e>
+            <k>@condition_decl</k>
+            <v>38495</v>
+        </e>
+        <e>
+            <k>@braced_init_list</k>
+            <v>1005</v>
+        </e>
+        <e>
+            <k>@type_id</k>
+            <v>36173</v>
+        </e>
+        <e>
+            <k>@runtime_sizeof</k>
+            <v>289248</v>
+        </e>
+        <e>
+            <k>@runtime_alignof</k>
+            <v>48208</v>
+        </e>
+        <e>
+            <k>@sizeof_pack</k>
+            <v>5664</v>
+        </e>
+        <e>
+            <k>@routineexpr</k>
+            <v>3065607</v>
+        </e>
+        <e>
+            <k>@type_operand</k>
+            <v>1125950</v>
+        </e>
+        <e>
+            <k>@offsetofexpr</k>
+            <v>20101</v>
+        </e>
+        <e>
+            <k>@isemptyexpr</k>
+            <v>2310</v>
+        </e>
+        <e>
+            <k>@ispodexpr</k>
+            <v>637</v>
+        </e>
+        <e>
+            <k>@hastrivialdestructor</k>
+            <v>472</v>
+        </e>
+        <e>
+            <k>@literal</k>
+            <v>4351842</v>
+        </e>
+        <e>
+            <k>@aggregateliteral</k>
+            <v>913874</v>
+        </e>
+        <e>
+            <k>@istrivialexpr</k>
+            <v>944</v>
+        </e>
+        <e>
+            <k>@istriviallycopyableexpr</k>
+            <v>3776</v>
+        </e>
+        <e>
+            <k>@isfinalexpr</k>
+            <v>2100</v>
+        </e>
+        <e>
+            <k>@noexceptexpr</k>
+            <v>35718</v>
+        </e>
+        <e>
+            <k>@builtinaddressof</k>
+            <v>13189</v>
+        </e>
+        <e>
+            <k>@temp_init</k>
+            <v>759580</v>
+        </e>
+        <e>
+            <k>@assume</k>
+            <v>3209</v>
+        </e>
+        <e>
+            <k>@conjugation</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@realpartexpr</k>
+            <v>69</v>
+        </e>
+        <e>
+            <k>@imagpartexpr</k>
+            <v>69</v>
+        </e>
+        <e>
+            <k>@jmulexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@jdivexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@fjaddexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@jfaddexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@fjsubexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@jfsubexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@minexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@maxexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@virtfunptrexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@vaargexpr</k>
+            <v>950</v>
+        </e>
+        <e>
+            <k>@vacopyexpr</k>
+            <v>139</v>
+        </e>
+        <e>
+            <k>@expr_stmt</k>
+            <v>94922</v>
+        </e>
+        <e>
+            <k>@hasassignexpr</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@hascopyexpr</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@hasnothrowassign</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@hasnothrowconstr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@hasnothrowcopy</k>
+            <v>5</v>
+        </e>
+        <e>
+            <k>@hastrivialassign</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@hastrivialconstr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@hastrivialcopy</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@hasuserdestr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@hasvirtualdestr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@isabstractexpr</k>
+            <v>17</v>
+        </e>
+        <e>
+            <k>@isbaseofexpr</k>
+            <v>37</v>
+        </e>
+        <e>
+            <k>@isclassexpr</k>
+            <v>1841</v>
+        </e>
+        <e>
+            <k>@isconvtoexpr</k>
+            <v>1155</v>
+        </e>
+        <e>
+            <k>@isenumexpr</k>
+            <v>1260</v>
+        </e>
+        <e>
+            <k>@ispolyexpr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@isunionexpr</k>
+            <v>5</v>
+        </e>
+        <e>
+            <k>@typescompexpr</k>
+            <v>562376</v>
+        </e>
+        <e>
+            <k>@intaddrexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@uuidof</k>
+            <v>20051</v>
+        </e>
+        <e>
+            <k>@foldexpr</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@dynamic_cast</k>
+            <v>1042</v>
+        </e>
+        <e>
+            <k>@noopexpr</k>
+            <v>37</v>
+        </e>
+        <e>
+            <k>@istriviallyconstructibleexpr</k>
+            <v>2836</v>
+        </e>
+        <e>
+            <k>@isdestructibleexpr</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@isnothrowdestructibleexpr</k>
+            <v>5</v>
+        </e>
+        <e>
+            <k>@istriviallydestructibleexpr</k>
+            <v>5</v>
+        </e>
+        <e>
+            <k>@istriviallyassignableexpr</k>
+            <v>525</v>
+        </e>
+        <e>
+            <k>@isnothrowassignableexpr</k>
+            <v>2100</v>
+        </e>
+        <e>
+            <k>@isstandardlayoutexpr</k>
+            <v>840</v>
+        </e>
+        <e>
+            <k>@isliteraltypeexpr</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@hastrivialmoveconstructorexpr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@hastrivialmoveassignexpr</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@hasnothrowmoveassignexpr</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@isconstructibleexpr</k>
+            <v>2731</v>
+        </e>
+        <e>
+            <k>@isnothrowconstructibleexpr</k>
+            <v>4831</v>
+        </e>
+        <e>
+            <k>@hasfinalizerexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@isdelegateexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@isinterfaceclassexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@isrefarrayexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@isrefclassexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@issealedexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@issimplevalueclassexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@isvalueclassexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@builtinshufflevector</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@builtinchooseexpr</k>
+            <v>9135</v>
+        </e>
+        <e>
+            <k>@vec_fill</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@builtinconvertvector</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@builtincomplex</k>
+            <v>4</v>
+        </e>
+        <e>
+            <k>@spaceshipexpr</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@co_await</k>
+            <v>6</v>
+        </e>
+        <e>
+            <k>@co_yield</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@lambdacapture</k>
+            <v>28320</v>
+        </e>
+        <e>
+            <k>@stmt_expr</k>
+            <v>1480310</v>
+        </e>
+        <e>
+            <k>@stmt_if</k>
+            <v>723123</v>
+        </e>
+        <e>
+            <k>@stmt_while</k>
+            <v>30265</v>
+        </e>
+        <e>
+            <k>@stmt_goto</k>
+            <v>110482</v>
+        </e>
+        <e>
+            <k>@stmt_label</k>
+            <v>53042</v>
+        </e>
+        <e>
+            <k>@stmt_return</k>
+            <v>1310769</v>
+        </e>
+        <e>
+            <k>@stmt_block</k>
+            <v>1451428</v>
+        </e>
+        <e>
+            <k>@stmt_end_test_while</k>
+            <v>148593</v>
+        </e>
+        <e>
+            <k>@stmt_for</k>
+            <v>61319</v>
+        </e>
+        <e>
+            <k>@stmt_switch_case</k>
+            <v>190914</v>
+        </e>
+        <e>
+            <k>@stmt_switch</k>
+            <v>20900</v>
+        </e>
+        <e>
+            <k>@stmt_asm</k>
+            <v>110581</v>
+        </e>
+        <e>
+            <k>@stmt_try_block</k>
+            <v>42591</v>
+        </e>
+        <e>
+            <k>@stmt_decl</k>
+            <v>609675</v>
+        </e>
+        <e>
+            <k>@stmt_empty</k>
+            <v>193503</v>
+        </e>
+        <e>
+            <k>@stmt_continue</k>
+            <v>22506</v>
+        </e>
+        <e>
+            <k>@stmt_break</k>
+            <v>102528</v>
+        </e>
+        <e>
+            <k>@stmt_range_based_for</k>
+            <v>8496</v>
+        </e>
+        <e>
+            <k>@stmt_handler</k>
+            <v>59279</v>
+        </e>
+        <e>
+            <k>@stmt_microsoft_try</k>
+            <v>163</v>
+        </e>
+        <e>
+            <k>@stmt_set_vla_size</k>
+            <v>26</v>
+        </e>
+        <e>
+            <k>@stmt_vla_decl</k>
+            <v>21</v>
+        </e>
+        <e>
+            <k>@stmt_assigned_goto</k>
+            <v>9058</v>
+        </e>
+        <e>
+            <k>@stmt_constexpr_if</k>
+            <v>52624</v>
+        </e>
+        <e>
+            <k>@stmt_co_return</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@ppd_if</k>
+            <v>671197</v>
+        </e>
+        <e>
+            <k>@ppd_ifdef</k>
+            <v>266213</v>
+        </e>
+        <e>
+            <k>@ppd_ifndef</k>
+            <v>269517</v>
+        </e>
+        <e>
+            <k>@ppd_elif</k>
+            <v>25488</v>
+        </e>
+        <e>
+            <k>@ppd_else</k>
+            <v>211460</v>
+        </e>
+        <e>
+            <k>@ppd_endif</k>
+            <v>1206927</v>
+        </e>
+        <e>
+            <k>@ppd_plain_include</k>
+            <v>314830</v>
+        </e>
+        <e>
+            <k>@ppd_define</k>
+            <v>2443222</v>
+        </e>
+        <e>
+            <k>@ppd_undef</k>
+            <v>264325</v>
+        </e>
+        <e>
+            <k>@ppd_pragma</k>
+            <v>313333</v>
+        </e>
+        <e>
+            <k>@ppd_include_next</k>
+            <v>1888</v>
+        </e>
+        <e>
+            <k>@ppd_line</k>
+            <v>27783</v>
+        </e>
+        <e>
+            <k>@ppd_error</k>
+            <v>46</v>
+        </e>
+        <e>
+            <k>@ppd_objc_import</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@ppd_warning</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@link_target</k>
+            <v>1471</v>
+        </e>
+        <e>
+            <k>@xmldtd</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@xmlelement</k>
+            <v>1270313</v>
+        </e>
+        <e>
+            <k>@xmlattribute</k>
+            <v>1202020</v>
+        </e>
+        <e>
+            <k>@xmlnamespace</k>
+            <v>4185</v>
+        </e>
+        <e>
+            <k>@xmlcomment</k>
+            <v>26812</v>
+        </e>
+        <e>
+            <k>@xmlcharacters</k>
+            <v>439958</v>
+        </e>
+    </typesizes>
+    <stats>
+        <relation>
+            <name>compilations</name>
+            <cardinality>9999</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>9999</v>
+                </e>
+                <e>
+                    <k>cwd</k>
+                    <v>11</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>cwd</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9999</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>cwd</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>863</a>
+                                    <b>864</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>compilation_args</name>
+            <cardinality>656105</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>5544</v>
+                </e>
+                <e>
+                    <k>num</k>
+                    <v>712</v>
+                </e>
+                <e>
+                    <k>arg</k>
+                    <v>34648</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>23</a>
+                                    <b>69</b>
+                                    <v>489</v>
+                                </b>
+                                <b>
+                                    <a>71</a>
+                                    <b>102</b>
+                                    <v>276</v>
+                                </b>
+                                <b>
+                                    <a>126</a>
+                                    <b>127</b>
+                                    <v>3889</v>
+                                </b>
+                                <b>
+                                    <a>127</a>
+                                    <b>129</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>131</a>
+                                    <b>132</b>
+                                    <v>819</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>135</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>arg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>23</a>
+                                    <b>57</b>
+                                    <v>489</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>106</b>
+                                    <v>292</v>
+                                </b>
+                                <b>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>3852</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>109</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>109</a>
+                                    <b>110</b>
+                                    <v>819</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>168</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>898</a>
+                                    <b>899</b>
+                                    <v>133</v>
+                                </b>
+                                <b>
+                                    <a>911</a>
+                                    <b>930</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>930</a>
+                                    <b>938</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>938</a>
+                                    <b>951</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>970</a>
+                                    <b>989</b>
+                                    <v>37</v>
+                                </b>
+                                <b>
+                                    <a>999</a>
+                                    <b>1000</b>
+                                    <v>74</v>
+                                </b>
+                                <b>
+                                    <a>1001</a>
+                                    <b>1013</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>1018</a>
+                                    <b>1040</b>
+                                    <v>63</v>
+                                </b>
+                                <b>
+                                    <a>1041</a>
+                                    <b>1042</b>
+                                    <v>5</v>
+                                </b>
+                                <b>
+                                    <a>1042</a>
+                                    <b>1043</b>
+                                    <v>122</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>arg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>5</b>
+                                    <v>63</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>63</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>31</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>47</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>18</b>
+                                    <v>63</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>22</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>26</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>36</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>169</b>
+                                    <v>58</v>
+                                </b>
+                                <b>
+                                    <a>169</a>
+                                    <b>819</b>
+                                    <v>53</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32573</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1043</b>
+                                    <v>2075</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33435</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>56</b>
+                                    <v>1213</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>compilation_compiling_files</name>
+            <cardinality>11494</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1988</v>
+                </e>
+                <e>
+                    <k>num</k>
+                    <v>3301</v>
+                </e>
+                <e>
+                    <k>file</k>
+                    <v>9983</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>994</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>238</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>84</b>
+                                    <v>119</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>994</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>238</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>84</b>
+                                    <v>119</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>715</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>13</b>
+                                    <v>278</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>51</b>
+                                    <v>198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>715</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>13</b>
+                                    <v>278</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>49</b>
+                                    <v>198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8989</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>835</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>159</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9148</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>compilation_time</name>
+            <cardinality>45979</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1988</v>
+                </e>
+                <e>
+                    <k>num</k>
+                    <v>3301</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>159</v>
+                </e>
+                <e>
+                    <k>seconds</k>
+                    <v>13762</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>994</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>238</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>84</b>
+                                    <v>119</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1988</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>278</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>715</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>238</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>26</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>132</b>
+                                    <v>119</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>715</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>357</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>13</b>
+                                    <v>278</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>51</b>
+                                    <v>198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3301</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1073</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>676</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>238</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>437</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>238</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>28</b>
+                                    <v>278</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>93</b>
+                                    <v>198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>159</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>83</a>
+                                    <b>84</b>
+                                    <v>159</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>167</a>
+                                    <b>168</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>178</a>
+                                    <b>179</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>seconds</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8591</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3420</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1312</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>40</b>
+                                    <v>437</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>seconds</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8591</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2744</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1551</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>64</b>
+                                    <v>875</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>seconds</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13483</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>diagnostic_for</name>
+            <cardinality>917206</cardinality>
+            <columnsizes>
+                <e>
+                    <k>diagnostic</k>
+                    <v>667106</v>
+                </e>
+                <e>
+                    <k>compilation</k>
+                    <v>1890</v>
+                </e>
+                <e>
+                    <k>file_number</k>
+                    <v>105</v>
+                </e>
+                <e>
+                    <k>file_number_diagnostic_number</k>
+                    <v>105144</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>diagnostic</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>465220</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>177937</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>23949</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>diagnostic</src>
+                    <trg>file_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>667106</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>diagnostic</src>
+                    <trg>file_number_diagnostic_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>633284</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>33822</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>diagnostic</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>78</a>
+                                    <b>79</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>119</a>
+                                    <b>120</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>155</a>
+                                    <b>156</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>156</a>
+                                    <b>157</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>352</a>
+                                    <b>353</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>353</a>
+                                    <b>354</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>710</a>
+                                    <b>711</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>756</a>
+                                    <b>757</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>1001</a>
+                                    <b>1002</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>file_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1890</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>file_number_diagnostic_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>78</a>
+                                    <b>79</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>119</a>
+                                    <b>120</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>155</a>
+                                    <b>156</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>156</a>
+                                    <b>157</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>352</a>
+                                    <b>353</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>353</a>
+                                    <b>354</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>710</a>
+                                    <b>711</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>756</a>
+                                    <b>757</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>1001</a>
+                                    <b>1002</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number</src>
+                    <trg>diagnostic</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6351</a>
+                                    <b>6352</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number</src>
+                    <trg>file_number_diagnostic_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1001</a>
+                                    <b>1002</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number_diagnostic_number</src>
+                    <trg>diagnostic</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>25734</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>12814</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>42015</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>8193</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>9978</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>5777</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number_diagnostic_number</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>25734</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>4831</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>37499</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>20587</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>8193</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>19</b>
+                                    <v>8193</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file_number_diagnostic_number</src>
+                    <trg>file_number</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105144</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>compilation_finished</name>
+            <cardinality>9999</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>9999</v>
+                </e>
+                <e>
+                    <k>cpu_seconds</k>
+                    <v>8319</v>
+                </e>
+                <e>
+                    <k>elapsed_seconds</k>
+                    <v>139</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>cpu_seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9999</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>elapsed_seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9999</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>cpu_seconds</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7160</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>915</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>11</b>
+                                    <v>243</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>cpu_seconds</src>
+                    <trg>elapsed_seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8064</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>254</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elapsed_seconds</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>95</a>
+                                    <b>96</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>136</a>
+                                    <b>137</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>254</a>
+                                    <b>255</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>257</a>
+                                    <b>258</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elapsed_seconds</src>
+                    <trg>cpu_seconds</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>64</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>91</a>
+                                    <b>92</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>94</a>
+                                    <b>95</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>203</a>
+                                    <b>204</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>233</a>
+                                    <b>234</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>externalData</name>
+            <cardinality>130</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>65</v>
+                </e>
+                <e>
+                    <k>path</k>
+                    <v>10</v>
+                </e>
+                <e>
+                    <k>column</k>
+                    <v>21</v>
+                </e>
+                <e>
+                    <k>value</k>
+                    <v>130</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>path</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>65</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>column</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>65</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>65</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>path</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>path</src>
+                    <trg>column</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>path</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>10</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>column</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>21</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>column</src>
+                    <trg>path</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>column</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>21</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>path</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>column</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>sourceLocationPrefix</name>
+            <cardinality>472</cardinality>
+            <columnsizes>
+                <e>
+                    <k>prefix</k>
+                    <v>472</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>external_packages</name>
+            <cardinality>4</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4</v>
+                </e>
+                <e>
+                    <k>namespace</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>package_name</k>
+                    <v>4</v>
+                </e>
+                <e>
+                    <k>version</k>
+                    <v>4</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>namespace</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>package_name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>version</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace</src>
+                    <trg>package_name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace</src>
+                    <trg>version</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package_name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package_name</src>
+                    <trg>namespace</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package_name</src>
+                    <trg>version</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>version</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>version</src>
+                    <trg>namespace</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>version</src>
+                    <trg>package_name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>header_to_external_package</name>
+            <cardinality>92</cardinality>
+            <columnsizes>
+                <e>
+                    <k>fileid</k>
+                    <v>92</v>
+                </e>
+                <e>
+                    <k>package</k>
+                    <v>4</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>fileid</src>
+                    <trg>package</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>92</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>svnentries</name>
+            <cardinality>575525</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>575525</v>
+                </e>
+                <e>
+                    <k>revision</k>
+                    <v>575525</v>
+                </e>
+                <e>
+                    <k>author</k>
+                    <v>19539</v>
+                </e>
+                <e>
+                    <k>revisionDate</k>
+                    <v>547759</v>
+                </e>
+                <e>
+                    <k>changeSize</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>revision</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>author</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>revisionDate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>changeSize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revision</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revision</src>
+                    <trg>author</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revision</src>
+                    <trg>revisionDate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revision</src>
+                    <trg>changeSize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>author</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7913</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2531</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1388</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1523</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>1529</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>20</b>
+                                    <v>1509</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>52</b>
+                                    <v>1488</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>568</b>
+                                    <v>1466</v>
+                                </b>
+                                <b>
+                                    <a>569</a>
+                                    <b>16582</b>
+                                    <v>192</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>author</src>
+                    <trg>revision</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7913</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2531</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1388</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1523</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>1529</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>20</b>
+                                    <v>1509</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>52</b>
+                                    <v>1488</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>568</b>
+                                    <v>1466</v>
+                                </b>
+                                <b>
+                                    <a>569</a>
+                                    <b>16582</b>
+                                    <v>192</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>author</src>
+                    <trg>revisionDate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7996</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2509</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1379</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1520</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>1529</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>20</b>
+                                    <v>1507</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>52</b>
+                                    <v>1474</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>662</b>
+                                    <v>1466</v>
+                                </b>
+                                <b>
+                                    <a>663</a>
+                                    <b>16573</b>
+                                    <v>159</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>author</src>
+                    <trg>changeSize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>19539</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revisionDate</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>531878</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>100</b>
+                                    <v>15881</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revisionDate</src>
+                    <trg>revision</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>531878</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>100</b>
+                                    <v>15881</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revisionDate</src>
+                    <trg>author</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>542505</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>5254</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>revisionDate</src>
+                    <trg>changeSize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>547759</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>changeSize</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>575525</a>
+                                    <b>575526</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>changeSize</src>
+                    <trg>revision</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>575525</a>
+                                    <b>575526</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>changeSize</src>
+                    <trg>author</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>19539</a>
+                                    <b>19540</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>changeSize</src>
+                    <trg>revisionDate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>547759</a>
+                                    <b>547760</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>svnaffectedfiles</name>
+            <cardinality>1314068</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>531628</v>
+                </e>
+                <e>
+                    <k>file</k>
+                    <v>90924</v>
+                </e>
+                <e>
+                    <k>action</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>337698</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>77525</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>43024</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>46689</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>16635</b>
+                                    <v>26692</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>action</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>531628</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11819</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>18230</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>9501</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6656</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>5012</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>7103</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>6788</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>6996</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>26</b>
+                                    <v>7180</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>54</b>
+                                    <v>6824</v>
+                                </b>
+                                <b>
+                                    <a>54</a>
+                                    <b>3572</b>
+                                    <v>4815</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>action</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>90924</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>action</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>531628</a>
+                                    <b>531629</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>action</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>90924</a>
+                                    <b>90925</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>svnentrymsg</name>
+            <cardinality>575525</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>575525</v>
+                </e>
+                <e>
+                    <k>message</k>
+                    <v>568305</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>575525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>message</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>565381</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>142</b>
+                                    <v>2924</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>svnchurn</name>
+            <cardinality>46790</cardinality>
+            <columnsizes>
+                <e>
+                    <k>commit</k>
+                    <v>22361</v>
+                </e>
+                <e>
+                    <k>file</k>
+                    <v>16124</v>
+                </e>
+                <e>
+                    <k>addedLines</k>
+                    <v>910</v>
+                </e>
+                <e>
+                    <k>deletedLines</k>
+                    <v>787</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>commit</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>15208</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3101</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1746</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>1774</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>246</b>
+                                    <v>532</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>commit</src>
+                    <trg>addedLines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16074</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3323</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1561</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>118</b>
+                                    <v>1403</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>commit</src>
+                    <trg>deletedLines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16799</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3286</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1763</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>113</b>
+                                    <v>513</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>commit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8618</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2956</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1426</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1364</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>1210</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>448</b>
+                                    <v>550</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>addedLines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9240</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3129</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1393</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1239</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>59</b>
+                                    <v>1123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>file</src>
+                    <trg>deletedLines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9525</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3192</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1401</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>1387</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>70</b>
+                                    <v>619</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>addedLines</src>
+                    <trg>commit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>446</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>133</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>70</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>68</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>70</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>57</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>6874</b>
+                                    <v>54</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>addedLines</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>445</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>132</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>68</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>73</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>58</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>6663</b>
+                                    <v>54</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>addedLines</src>
+                    <trg>deletedLines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>621</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>96</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>81</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>34</b>
+                                    <v>70</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>727</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>deletedLines</src>
+                    <trg>commit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>439</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>116</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>48</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>67</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>28</b>
+                                    <v>60</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>6794</b>
+                                    <v>57</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>deletedLines</src>
+                    <trg>file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>437</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>113</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>49</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>61</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>19</b>
+                                    <v>60</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>770</b>
+                                    <v>60</v>
+                                </b>
+                                <b>
+                                    <a>985</a>
+                                    <b>7318</b>
+                                    <v>7</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>deletedLines</src>
+                    <trg>addedLines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>545</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>72</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>30</b>
+                                    <v>60</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>871</b>
+                                    <v>41</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>locations_default</name>
+            <cardinality>30199622</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>30199622</v>
+                </e>
+                <e>
+                    <k>container</k>
+                    <v>140186</v>
+                </e>
+                <e>
+                    <k>startLine</k>
+                    <v>2121681</v>
+                </e>
+                <e>
+                    <k>startColumn</k>
+                    <v>37288</v>
+                </e>
+                <e>
+                    <k>endLine</k>
+                    <v>2124985</v>
+                </e>
+                <e>
+                    <k>endColumn</k>
+                    <v>48616</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30199622</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30199622</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30199622</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30199622</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30199622</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16048</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>12</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>20</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>36</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>55</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>77</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>102</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>146</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>148</a>
+                                    <b>223</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>226</a>
+                                    <b>350</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>358</a>
+                                    <b>628</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>671</a>
+                                    <b>1926</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>2171</a>
+                                    <b>2380</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16048</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>9</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>25</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>40</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>57</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>72</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>73</a>
+                                    <b>99</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>101</a>
+                                    <b>141</b>
+                                    <v>12272</v>
+                                </b>
+                                <b>
+                                    <a>148</a>
+                                    <b>226</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>226</a>
+                                    <b>365</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>372</a>
+                                    <b>1253</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>1452</a>
+                                    <b>1616</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16048</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>8968</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>7552</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>7552</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>12272</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>25</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>31</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>38</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>52</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>64</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>77</b>
+                                    <v>9440</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16048</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>9</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>25</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>40</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>57</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>71</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>97</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>97</a>
+                                    <b>140</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>140</a>
+                                    <b>225</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>225</a>
+                                    <b>365</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>372</a>
+                                    <b>1253</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>1449</a>
+                                    <b>1613</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16048</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>10</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>21</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>31</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>39</b>
+                                    <v>12744</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>48</b>
+                                    <v>12272</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>56</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>64</b>
+                                    <v>11800</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>72</b>
+                                    <v>10856</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>77</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>90</b>
+                                    <v>8496</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>598507</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>302085</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>190691</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>171339</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>192579</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>161427</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>24</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>42</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>142</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>142</a>
+                                    <b>298</b>
+                                    <v>26432</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>881241</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>262437</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>135466</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>195883</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>11</b>
+                                    <v>177475</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>161899</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>29</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>298</b>
+                                    <v>147738</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625884</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>296893</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>203435</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>195411</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>178891</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>167091</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>178419</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>29</b>
+                                    <v>162843</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>52</b>
+                                    <v>112810</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1552910</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>345510</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>171811</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>16</b>
+                                    <v>51449</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>601811</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>305389</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>194939</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>174171</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>165675</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>172755</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>20</b>
+                                    <v>164259</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>31</b>
+                                    <v>171339</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>58</b>
+                                    <v>160955</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>67</b>
+                                    <v>10384</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>31</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>85</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>86</a>
+                                    <b>128</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>129</a>
+                                    <b>230</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>247</a>
+                                    <b>292</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>292</a>
+                                    <b>360</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>377</a>
+                                    <b>459</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>476</a>
+                                    <b>559</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>565</a>
+                                    <b>620</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>625</a>
+                                    <b>689</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>700</a>
+                                    <b>795</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>820</a>
+                                    <b>1546</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>1698</a>
+                                    <b>5668</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>15394</a>
+                                    <b>15395</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>18</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>35</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>43</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>61</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>73</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>73</a>
+                                    <b>83</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>96</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>96</a>
+                                    <b>100</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>101</a>
+                                    <b>103</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>104</a>
+                                    <b>108</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>115</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>116</a>
+                                    <b>150</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>152</a>
+                                    <b>298</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>19</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>72</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>122</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>204</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>213</a>
+                                    <b>262</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>264</a>
+                                    <b>324</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>324</a>
+                                    <b>380</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>404</a>
+                                    <b>439</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>455</a>
+                                    <b>475</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>477</a>
+                                    <b>510</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>517</a>
+                                    <b>579</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>588</a>
+                                    <b>836</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>1112</a>
+                                    <b>2199</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>2401</a>
+                                    <b>2402</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>19</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>72</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>122</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>204</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>213</a>
+                                    <b>262</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>264</a>
+                                    <b>324</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>324</a>
+                                    <b>380</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>405</a>
+                                    <b>439</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>455</a>
+                                    <b>475</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>476</a>
+                                    <b>509</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>520</a>
+                                    <b>578</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>588</a>
+                                    <b>835</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>1115</a>
+                                    <b>2200</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>2409</a>
+                                    <b>2410</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>7</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>13</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>23</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>25</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>31</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>36</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>41</b>
+                                    <v>2360</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>46</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>50</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>62</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>81</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>85</a>
+                                    <b>86</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>600867</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>301141</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>198243</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>165203</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>189275</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>163315</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>24</b>
+                                    <v>161899</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>43</b>
+                                    <v>162371</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>145</b>
+                                    <v>160011</v>
+                                </b>
+                                <b>
+                                    <a>146</a>
+                                    <b>298</b>
+                                    <v>22656</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>883129</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>275181</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>194467</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>177947</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>171811</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>39</b>
+                                    <v>160011</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>298</b>
+                                    <v>102898</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1542998</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>354006</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>170395</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>57585</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>625412</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>301613</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>204852</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>194467</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>175115</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>172755</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>19</b>
+                                    <v>179363</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>30</b>
+                                    <v>165203</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>52</b>
+                                    <v>106202</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>605115</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>305389</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>200603</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>168507</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>164259</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>174171</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>20</b>
+                                    <v>161899</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>30</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>54</b>
+                                    <v>159539</v>
+                                </b>
+                                <b>
+                                    <a>54</a>
+                                    <b>66</b>
+                                    <v>25960</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5192</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>184</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>196</a>
+                                    <b>295</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>297</a>
+                                    <b>492</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>506</a>
+                                    <b>553</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>560</a>
+                                    <b>632</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>638</a>
+                                    <b>760</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>763</a>
+                                    <b>871</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>878</a>
+                                    <b>1082</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>1085</a>
+                                    <b>1286</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>1307</a>
+                                    <b>1590</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>1674</a>
+                                    <b>2430</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5664</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>65</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>99</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>99</a>
+                                    <b>112</b>
+                                    <v>4248</v>
+                                </b>
+                                <b>
+                                    <a>113</a>
+                                    <b>122</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>124</a>
+                                    <b>140</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>143</a>
+                                    <b>153</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>153</a>
+                                    <b>160</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>160</a>
+                                    <b>172</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>172</a>
+                                    <b>176</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>176</a>
+                                    <b>208</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>240</a>
+                                    <b>298</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5664</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>106</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>152</a>
+                                    <b>242</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>253</a>
+                                    <b>333</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>339</a>
+                                    <b>430</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>434</a>
+                                    <b>490</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>493</a>
+                                    <b>572</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>572</a>
+                                    <b>623</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>629</a>
+                                    <b>696</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>703</a>
+                                    <b>814</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>822</a>
+                                    <b>994</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>1107</a>
+                                    <b>1175</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6136</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>22</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>29</b>
+                                    <v>4248</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>35</b>
+                                    <v>4248</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>39</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>42</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>44</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>46</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>50</b>
+                                    <v>4248</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>53</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5664</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>153</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>157</a>
+                                    <b>243</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>250</a>
+                                    <b>333</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>341</a>
+                                    <b>432</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>432</a>
+                                    <b>488</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>495</a>
+                                    <b>571</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>573</a>
+                                    <b>621</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>628</a>
+                                    <b>700</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>703</a>
+                                    <b>815</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>819</a>
+                                    <b>994</b>
+                                    <v>3776</v>
+                                </b>
+                                <b>
+                                    <a>1108</a>
+                                    <b>1177</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>locations_stmt</name>
+            <cardinality>3805195</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>3805195</v>
+                </e>
+                <e>
+                    <k>container</k>
+                    <v>3076</v>
+                </e>
+                <e>
+                    <k>startLine</k>
+                    <v>199402</v>
+                </e>
+                <e>
+                    <k>startColumn</k>
+                    <v>1866</v>
+                </e>
+                <e>
+                    <k>endLine</k>
+                    <v>193680</v>
+                </e>
+                <e>
+                    <k>endColumn</k>
+                    <v>2358</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3805195</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3805195</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3805195</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3805195</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3805195</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>13</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>48</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>61</a>
+                                    <b>175</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>176</a>
+                                    <b>417</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>436</a>
+                                    <b>608</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>621</a>
+                                    <b>797</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>848</a>
+                                    <b>1139</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1158</a>
+                                    <b>1417</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1453</a>
+                                    <b>1715</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1771</a>
+                                    <b>2252</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>2282</a>
+                                    <b>2669</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>2736</a>
+                                    <b>3751</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>3768</a>
+                                    <b>4993</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>13</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>47</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>161</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>169</a>
+                                    <b>371</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>393</a>
+                                    <b>586</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>602</a>
+                                    <b>783</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>845</a>
+                                    <b>1120</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1131</a>
+                                    <b>1390</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1394</a>
+                                    <b>1692</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1726</a>
+                                    <b>2208</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>2225</a>
+                                    <b>2680</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>2777</a>
+                                    <b>3643</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>3885</a>
+                                    <b>4846</b>
+                                    <v>102</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>3</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>13</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>19</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>21</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>23</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>29</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>43</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>60</b>
+                                    <v>143</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>11</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>34</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>132</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>282</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>294</a>
+                                    <b>452</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>459</a>
+                                    <b>601</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>609</a>
+                                    <b>831</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>838</a>
+                                    <b>1062</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1071</a>
+                                    <b>1265</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1323</a>
+                                    <b>1679</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>1688</a>
+                                    <b>2006</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>2044</a>
+                                    <b>2758</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>2776</a>
+                                    <b>3873</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>8</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>21</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>45</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>56</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>63</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>67</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>67</a>
+                                    <b>69</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>71</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>71</a>
+                                    <b>72</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>74</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>76</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>76</a>
+                                    <b>80</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>81</a>
+                                    <b>96</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21492</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15258</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12448</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>14417</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>12489</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>16673</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>17226</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>22</b>
+                                    <v>15319</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>29</b>
+                                    <v>16939</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>37</b>
+                                    <v>17329</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>45</b>
+                                    <v>15053</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>56</b>
+                                    <v>16140</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>73</b>
+                                    <v>8613</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22251</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15688</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12653</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>14355</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>12694</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>17534</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>16324</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>22</b>
+                                    <v>16181</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>29</b>
+                                    <v>16919</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>36</b>
+                                    <v>15955</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>44</b>
+                                    <v>16283</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>54</b>
+                                    <v>15606</v>
+                                </b>
+                                <b>
+                                    <a>54</a>
+                                    <b>69</b>
+                                    <v>6952</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26763</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20795</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16775</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>16037</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>17391</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>19811</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>22702</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>20344</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>14971</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>16611</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>7198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34515</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>25737</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>18395</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>16181</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>12756</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11997</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>10151</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>10951</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>10705</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>10500</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>10151</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>15750</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>24</b>
+                                    <v>11607</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22087</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16160</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12920</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>16037</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>14663</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>13166</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>14</b>
+                                    <v>18252</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>18</b>
+                                    <v>16980</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>22</b>
+                                    <v>17534</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>26</b>
+                                    <v>18457</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>30</b>
+                                    <v>16345</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>36</b>
+                                    <v>15196</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>42</b>
+                                    <v>1599</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>53</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>54</a>
+                                    <b>74</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>78</a>
+                                    <b>92</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>134</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>228</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>228</a>
+                                    <b>2062</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>3245</a>
+                                    <b>40863</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>53257</a>
+                                    <b>53258</b>
+                                    <v>20</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>287</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>102</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>18</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>22</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>24</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>29</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>42</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>109</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>116</a>
+                                    <b>150</b>
+                                    <v>143</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>53</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>54</a>
+                                    <b>74</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>88</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>90</a>
+                                    <b>131</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>224</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>226</a>
+                                    <b>1699</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>2430</a>
+                                    <b>7900</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>8302</a>
+                                    <b>8303</b>
+                                    <v>20</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>53</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>54</a>
+                                    <b>74</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>88</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>90</a>
+                                    <b>130</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>221</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>226</a>
+                                    <b>1414</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>2290</a>
+                                    <b>7741</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>8096</a>
+                                    <b>8097</b>
+                                    <v>20</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>287</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>82</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>15</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>26</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>35</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>69</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>104</b>
+                                    <v>143</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17370</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>14376</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11464</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>15565</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>12469</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>15422</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>15</b>
+                                    <v>14601</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>21</b>
+                                    <v>16058</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>27</b>
+                                    <v>15381</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>34</b>
+                                    <v>14909</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>42</b>
+                                    <v>15709</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>52</b>
+                                    <v>15975</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>130</b>
+                                    <v>14376</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24897</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16099</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12735</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>15627</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>14971</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>15852</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>17411</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>20</b>
+                                    <v>14560</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>26</b>
+                                    <v>17124</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>32</b>
+                                    <v>16222</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>39</b>
+                                    <v>14827</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>59</b>
+                                    <v>13350</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32403</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>23707</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>18416</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>15114</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>13843</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>11648</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>11710</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>10889</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>10151</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>17924</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>15</b>
+                                    <v>17678</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>100</b>
+                                    <v>10192</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24897</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20344</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16796</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>17760</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>18539</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>20385</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>22374</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>18703</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>12899</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>14991</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>5988</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24650</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16591</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12510</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>17780</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>15299</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>12797</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>13</b>
+                                    <v>14376</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>14991</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>19</b>
+                                    <v>14622</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>22</b>
+                                    <v>14007</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>26</b>
+                                    <v>17083</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>15299</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>39</b>
+                                    <v>3670</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>16</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>133</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>151</a>
+                                    <b>393</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>394</a>
+                                    <b>681</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>708</a>
+                                    <b>1137</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1138</a>
+                                    <b>1674</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1885</a>
+                                    <b>2795</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2939</a>
+                                    <b>4095</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4142</a>
+                                    <b>4771</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>5032</a>
+                                    <b>15460</b>
+                                    <v>164</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>21</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>70</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>96</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>97</a>
+                                    <b>108</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>114</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>115</a>
+                                    <b>118</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>118</a>
+                                    <b>122</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>122</a>
+                                    <b>123</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>125</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>125</a>
+                                    <b>149</b>
+                                    <v>164</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>15</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>130</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>145</a>
+                                    <b>378</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>385</a>
+                                    <b>652</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>666</a>
+                                    <b>964</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>999</a>
+                                    <b>1431</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1587</a>
+                                    <b>2171</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2264</a>
+                                    <b>2917</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2947</a>
+                                    <b>3215</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>3417</a>
+                                    <b>5822</b>
+                                    <v>164</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>16</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>19</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>21</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>23</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>25</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>28</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>33</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>57</b>
+                                    <v>61</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>27</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>132</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>142</a>
+                                    <b>329</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>366</a>
+                                    <b>583</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>613</a>
+                                    <b>968</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1056</a>
+                                    <b>1409</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1420</a>
+                                    <b>2035</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2066</a>
+                                    <b>2627</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2651</a>
+                                    <b>3073</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>3086</a>
+                                    <b>4522</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>locations_expr</name>
+            <cardinality>13127189</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>13127189</v>
+                </e>
+                <e>
+                    <k>container</k>
+                    <v>4347</v>
+                </e>
+                <e>
+                    <k>startLine</k>
+                    <v>191486</v>
+                </e>
+                <e>
+                    <k>startColumn</k>
+                    <v>2460</v>
+                </e>
+                <e>
+                    <k>endLine</k>
+                    <v>191465</v>
+                </e>
+                <e>
+                    <k>endColumn</k>
+                    <v>2789</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13127189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13127189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13127189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13127189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13127189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>369</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>348</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>34</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>136</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>166</a>
+                                    <b>594</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>677</a>
+                                    <b>1614</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>1623</a>
+                                    <b>2416</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>2490</a>
+                                    <b>3669</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>3705</a>
+                                    <b>5161</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>5341</a>
+                                    <b>6838</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>7344</a>
+                                    <b>9012</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>9073</a>
+                                    <b>13259</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>13617</a>
+                                    <b>18812</b>
+                                    <v>82</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>451</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>348</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>22</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>87</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>97</a>
+                                    <b>207</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>213</a>
+                                    <b>437</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>454</a>
+                                    <b>689</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>719</a>
+                                    <b>977</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>997</a>
+                                    <b>1292</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>1332</a>
+                                    <b>1781</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>1851</a>
+                                    <b>2320</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>2491</a>
+                                    <b>4241</b>
+                                    <v>266</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>451</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>389</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>369</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>27</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>55</b>
+                                    <v>369</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>64</b>
+                                    <v>348</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>67</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>67</a>
+                                    <b>69</b>
+                                    <v>369</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>70</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>71</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>71</a>
+                                    <b>72</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>74</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>83</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>90</a>
+                                    <b>108</b>
+                                    <v>82</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>451</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>348</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>10</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>22</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>87</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>97</a>
+                                    <b>207</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>214</a>
+                                    <b>437</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>454</a>
+                                    <b>691</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>719</a>
+                                    <b>978</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>998</a>
+                                    <b>1293</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>1332</a>
+                                    <b>1785</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>1855</a>
+                                    <b>2324</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>2500</a>
+                                    <b>4416</b>
+                                    <v>266</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>container</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>410</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>389</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>29</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>55</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>69</b>
+                                    <v>389</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>73</b>
+                                    <v>348</v>
+                                </b>
+                                <b>
+                                    <a>73</a>
+                                    <b>75</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>76</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>76</a>
+                                    <b>77</b>
+                                    <v>410</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>79</b>
+                                    <v>348</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>83</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>116</b>
+                                    <v>287</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>5</b>
+                                    <v>16078</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>16447</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>15996</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>23</b>
+                                    <v>15073</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>32</b>
+                                    <v>15114</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>44</b>
+                                    <v>14971</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>60</b>
+                                    <v>14724</v>
+                                </b>
+                                <b>
+                                    <a>60</a>
+                                    <b>80</b>
+                                    <v>14807</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>103</b>
+                                    <v>14581</v>
+                                </b>
+                                <b>
+                                    <a>103</a>
+                                    <b>130</b>
+                                    <v>14786</v>
+                                </b>
+                                <b>
+                                    <a>130</a>
+                                    <b>159</b>
+                                    <v>14560</v>
+                                </b>
+                                <b>
+                                    <a>159</a>
+                                    <b>194</b>
+                                    <v>14560</v>
+                                </b>
+                                <b>
+                                    <a>194</a>
+                                    <b>302</b>
+                                    <v>9782</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23461</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15586</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11320</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>16324</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>13597</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>16406</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>17329</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>21</b>
+                                    <v>16406</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>28</b>
+                                    <v>16611</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>35</b>
+                                    <v>15955</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>43</b>
+                                    <v>15934</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>60</b>
+                                    <v>12551</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>15934</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>17493</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>11</b>
+                                    <v>16652</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>17370</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>21</b>
+                                    <v>17473</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>26</b>
+                                    <v>15032</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>16140</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>36</b>
+                                    <v>17698</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>40</b>
+                                    <v>15791</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>44</b>
+                                    <v>16529</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>49</b>
+                                    <v>16591</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>63</b>
+                                    <v>8777</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>101762</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>44564</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>27501</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>14540</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>23</b>
+                                    <v>3117</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startLine</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>16919</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>16611</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>11</b>
+                                    <v>16386</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>16181</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>21</b>
+                                    <v>16406</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>27</b>
+                                    <v>16734</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>33</b>
+                                    <v>16406</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>38</b>
+                                    <v>14458</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>43</b>
+                                    <v>15504</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>47</b>
+                                    <v>14745</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>52</b>
+                                    <v>16714</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>65</b>
+                                    <v>14376</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>70</b>
+                                    <v>41</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>26</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>251</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>279</a>
+                                    <b>840</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>951</a>
+                                    <b>1889</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2097</a>
+                                    <b>4180</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4240</a>
+                                    <b>7018</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>7166</a>
+                                    <b>11389</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>12326</a>
+                                    <b>15119</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>15349</a>
+                                    <b>30165</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>30211</a>
+                                    <b>49562</b>
+                                    <v>82</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>143</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>28</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>98</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>103</a>
+                                    <b>122</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>130</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>132</a>
+                                    <b>138</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>138</a>
+                                    <b>142</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>142</a>
+                                    <b>144</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>144</a>
+                                    <b>148</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>149</a>
+                                    <b>155</b>
+                                    <v>164</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>19</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>151</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>196</a>
+                                    <b>585</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>622</a>
+                                    <b>1287</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1368</a>
+                                    <b>2342</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2570</a>
+                                    <b>3505</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>3522</a>
+                                    <b>4711</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4732</a>
+                                    <b>5298</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>5332</a>
+                                    <b>5999</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>6158</a>
+                                    <b>6996</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>19</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>151</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>196</a>
+                                    <b>585</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>647</a>
+                                    <b>1289</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>1368</a>
+                                    <b>2346</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>2573</a>
+                                    <b>3511</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>3528</a>
+                                    <b>4712</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>4735</a>
+                                    <b>5324</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>5346</a>
+                                    <b>6023</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>6202</a>
+                                    <b>7039</b>
+                                    <v>123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>startColumn</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>123</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>20</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>30</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>42</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>59</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>59</a>
+                                    <b>69</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>74</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>83</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>96</b>
+                                    <v>143</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>5</b>
+                                    <v>16099</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>16447</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>15770</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>23</b>
+                                    <v>15053</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>32</b>
+                                    <v>15606</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>44</b>
+                                    <v>14704</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>60</b>
+                                    <v>14458</v>
+                                </b>
+                                <b>
+                                    <a>60</a>
+                                    <b>80</b>
+                                    <v>15237</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>103</b>
+                                    <v>14478</v>
+                                </b>
+                                <b>
+                                    <a>103</a>
+                                    <b>130</b>
+                                    <v>14786</v>
+                                </b>
+                                <b>
+                                    <a>130</a>
+                                    <b>159</b>
+                                    <v>14458</v>
+                                </b>
+                                <b>
+                                    <a>159</a>
+                                    <b>193</b>
+                                    <v>14376</v>
+                                </b>
+                                <b>
+                                    <a>193</a>
+                                    <b>299</b>
+                                    <v>9987</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23461</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15524</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11320</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>16016</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>13453</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>16468</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>15</b>
+                                    <v>14458</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>20</b>
+                                    <v>16673</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>26</b>
+                                    <v>14971</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>33</b>
+                                    <v>16119</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>40</b>
+                                    <v>14724</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>49</b>
+                                    <v>14724</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>60</b>
+                                    <v>3547</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>95343</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>49835</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>29306</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>15565</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>1415</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>15791</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>17411</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>11</b>
+                                    <v>16447</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>17309</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>21</b>
+                                    <v>17268</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>26</b>
+                                    <v>15114</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>31</b>
+                                    <v>16263</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>36</b>
+                                    <v>17678</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>40</b>
+                                    <v>15340</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>44</b>
+                                    <v>16591</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>49</b>
+                                    <v>16734</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>63</b>
+                                    <v>9515</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endLine</src>
+                    <trg>endColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>17144</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>16755</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>11</b>
+                                    <v>16386</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>16837</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>21</b>
+                                    <v>15975</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>26</b>
+                                    <v>14478</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>32</b>
+                                    <v>16119</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>37</b>
+                                    <v>14376</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>42</b>
+                                    <v>15832</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>46</b>
+                                    <v>14232</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>51</b>
+                                    <v>17247</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>59</b>
+                                    <v>14458</v>
+                                </b>
+                                <b>
+                                    <a>59</a>
+                                    <b>69</b>
+                                    <v>1620</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>10</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>51</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>615</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>834</a>
+                                    <b>2288</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2328</a>
+                                    <b>4150</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>4177</a>
+                                    <b>7133</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>8237</a>
+                                    <b>11757</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>12358</a>
+                                    <b>15463</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>15685</a>
+                                    <b>18241</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>18731</a>
+                                    <b>19130</b>
+                                    <v>82</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>container</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>328</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>41</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>113</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>113</a>
+                                    <b>128</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>135</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>135</a>
+                                    <b>139</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>139</a>
+                                    <b>146</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>146</a>
+                                    <b>148</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>148</a>
+                                    <b>152</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>152</a>
+                                    <b>153</b>
+                                    <v>41</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>startLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>53</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>491</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>512</a>
+                                    <b>1332</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>1392</a>
+                                    <b>2419</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2763</a>
+                                    <b>3740</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>3801</a>
+                                    <b>4530</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>4641</a>
+                                    <b>5303</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>5377</a>
+                                    <b>5735</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>5747</a>
+                                    <b>5806</b>
+                                    <v>41</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>startColumn</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>205</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>21</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>28</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>36</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>42</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>49</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>59</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>59</a>
+                                    <b>65</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>71</b>
+                                    <v>205</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>endColumn</src>
+                    <trg>endLine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>246</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>53</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>473</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>500</a>
+                                    <b>1302</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>1356</a>
+                                    <b>2389</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>2626</a>
+                                    <b>3666</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>3731</a>
+                                    <b>4489</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>4638</a>
+                                    <b>5281</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>5366</a>
+                                    <b>5729</b>
+                                    <v>225</v>
+                                </b>
+                                <b>
+                                    <a>5734</a>
+                                    <b>5796</b>
+                                    <v>41</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>numlines</name>
+            <cardinality>1411307</cardinality>
+            <columnsizes>
+                <e>
+                    <k>element_id</k>
+                    <v>1404227</v>
+                </e>
+                <e>
+                    <k>num_lines</k>
+                    <v>103842</v>
+                </e>
+                <e>
+                    <k>num_code</k>
+                    <v>85433</v>
+                </e>
+                <e>
+                    <k>num_comment</k>
+                    <v>59945</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>element_id</src>
+                    <trg>num_lines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1397147</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7080</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element_id</src>
+                    <trg>num_code</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1398091</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6136</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element_id</src>
+                    <trg>num_comment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1404227</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_lines</src>
+                    <trg>element_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>69385</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>14160</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>8496</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>63</b>
+                                    <v>8024</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>926</b>
+                                    <v>3776</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_lines</src>
+                    <trg>num_code</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>71745</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>14160</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>7552</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>8968</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_lines</src>
+                    <trg>num_comment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>70801</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16992</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>9912</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>6136</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_code</src>
+                    <trg>element_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52393</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15104</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>6608</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>42</b>
+                                    <v>6608</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>927</b>
+                                    <v>4720</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_code</src>
+                    <trg>num_lines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52393</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>17464</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>6136</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>7080</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_code</src>
+                    <trg>num_comment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52865</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16520</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>7552</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>5192</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>3304</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_comment</src>
+                    <trg>element_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34928</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8496</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>5192</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>2622</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_comment</src>
+                    <trg>num_lines</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34928</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8496</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>37</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_comment</src>
+                    <trg>num_code</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34928</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8496</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>4720</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>37</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>diagnostics</name>
+            <cardinality>667106</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>667106</v>
+                </e>
+                <e>
+                    <k>severity</k>
+                    <v>210</v>
+                </e>
+                <e>
+                    <k>error_tag</k>
+                    <v>7142</v>
+                </e>
+                <e>
+                    <k>error_message</k>
+                    <v>50629</v>
+                </e>
+                <e>
+                    <k>full_error_message</k>
+                    <v>666371</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>366903</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>667106</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>667106</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>667106</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>667106</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>667106</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>375</a>
+                                    <b>376</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>5976</a>
+                                    <b>5977</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>476</a>
+                                    <b>477</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>375</a>
+                                    <b>376</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>5969</a>
+                                    <b>5970</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>211</a>
+                                    <b>212</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>3378</a>
+                                    <b>3379</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>735</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>735</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>17</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>30</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>51</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>149</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>200</a>
+                                    <b>808</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>845</a>
+                                    <b>1335</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7142</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4726</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>420</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>53</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>249</a>
+                                    <b>250</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>840</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>735</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>17</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>30</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>51</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>149</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>200</a>
+                                    <b>808</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>845</a>
+                                    <b>1335</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1155</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>840</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>735</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>420</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>420</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>525</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>25</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>51</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>219</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>382</a>
+                                    <b>733</b>
+                                    <v>525</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20377</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10503</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2415</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4411</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>3991</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>4096</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>67</b>
+                                    <v>3886</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>1335</b>
+                                    <v>945</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50629</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50629</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20482</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10503</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2415</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4411</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>3991</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>3991</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>67</b>
+                                    <v>3886</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>1335</b>
+                                    <v>945</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_message</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>32352</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5987</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>3886</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>3886</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>86</b>
+                                    <v>3886</v>
+                                </b>
+                                <b>
+                                    <a>130</a>
+                                    <b>733</b>
+                                    <v>630</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>666266</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>666371</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>666371</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>666371</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>full_error_message</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>666371</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>184554</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>134345</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>31721</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>17</b>
+                                    <v>16281</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>severity</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>356819</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10083</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>349361</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>17541</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>348836</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>18066</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>184659</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>134345</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>31721</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>17</b>
+                                    <v>16176</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>files</name>
+            <cardinality>124610</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>124610</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>124610</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>124610</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>124610</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>folders</name>
+            <cardinality>15576</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>15576</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>15576</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>15576</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>15576</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>containerparent</name>
+            <cardinality>139242</cardinality>
+            <columnsizes>
+                <e>
+                    <k>parent</k>
+                    <v>15576</v>
+                </e>
+                <e>
+                    <k>child</k>
+                    <v>139242</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>parent</src>
+                    <trg>child</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6608</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>28</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>67</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>139242</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fileannotations</name>
+            <cardinality>5264964</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>5028</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>23</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>56220</v>
+                </e>
+                <e>
+                    <k>value</k>
+                    <v>47263</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>173</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4854</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>102</b>
+                                    <v>393</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>225</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>227</a>
+                                    <b>299</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>301</a>
+                                    <b>452</b>
+                                    <v>405</v>
+                                </b>
+                                <b>
+                                    <a>452</a>
+                                    <b>555</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>559</a>
+                                    <b>626</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>626</a>
+                                    <b>716</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>729</a>
+                                    <b>904</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>904</a>
+                                    <b>934</b>
+                                    <v>81</v>
+                                </b>
+                                <b>
+                                    <a>936</a>
+                                    <b>937</b>
+                                    <v>1459</v>
+                                </b>
+                                <b>
+                                    <a>1083</a>
+                                    <b>2036</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>2293</a>
+                                    <b>2294</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>114</b>
+                                    <v>393</v>
+                                </b>
+                                <b>
+                                    <a>114</a>
+                                    <b>275</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>275</a>
+                                    <b>363</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>393</a>
+                                    <b>638</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>643</a>
+                                    <b>744</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>751</a>
+                                    <b>955</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>955</a>
+                                    <b>1087</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>1088</a>
+                                    <b>1501</b>
+                                    <v>254</v>
+                                </b>
+                                <b>
+                                    <a>1501</a>
+                                    <b>1502</b>
+                                    <v>1459</v>
+                                </b>
+                                <b>
+                                    <a>1504</a>
+                                    <b>1874</b>
+                                    <v>382</v>
+                                </b>
+                                <b>
+                                    <a>1972</a>
+                                    <b>4080</b>
+                                    <v>243</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>419</a>
+                                    <b>420</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>434</a>
+                                    <b>435</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4850</a>
+                                    <b>4851</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>4079</a>
+                                    <b>4080</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9095</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6384</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>4287</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>4379</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>4090</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>18</b>
+                                    <v>4287</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>4843</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>34</b>
+                                    <v>4333</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>128</b>
+                                    <v>4623</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>229</b>
+                                    <v>4229</v>
+                                </b>
+                                <b>
+                                    <a>229</a>
+                                    <b>387</b>
+                                    <v>4356</v>
+                                </b>
+                                <b>
+                                    <a>387</a>
+                                    <b>434</b>
+                                    <v>1309</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>56220</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9107</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8273</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2630</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>4634</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>4240</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>14</b>
+                                    <v>4321</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>17</b>
+                                    <v>4240</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>22</b>
+                                    <v>4715</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>41</b>
+                                    <v>4321</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>82</b>
+                                    <v>4275</v>
+                                </b>
+                                <b>
+                                    <a>82</a>
+                                    <b>157</b>
+                                    <v>4217</v>
+                                </b>
+                                <b>
+                                    <a>158</a>
+                                    <b>1895</b>
+                                    <v>1239</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7346</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>2294</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>3418</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>3626</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>17</b>
+                                    <v>2607</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>19</b>
+                                    <v>4252</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>34</b>
+                                    <v>3418</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>189</b>
+                                    <v>3719</v>
+                                </b>
+                                <b>
+                                    <a>189</a>
+                                    <b>201</b>
+                                    <v>3707</v>
+                                </b>
+                                <b>
+                                    <a>201</a>
+                                    <b>266</b>
+                                    <v>3649</v>
+                                </b>
+                                <b>
+                                    <a>266</a>
+                                    <b>321</b>
+                                    <v>3777</v>
+                                </b>
+                                <b>
+                                    <a>322</a>
+                                    <b>399</b>
+                                    <v>4055</v>
+                                </b>
+                                <b>
+                                    <a>399</a>
+                                    <b>435</b>
+                                    <v>1390</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>47251</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7369</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>2653</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>3603</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>3649</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>17</b>
+                                    <v>2908</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>19</b>
+                                    <v>3684</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>29</b>
+                                    <v>3603</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>39</b>
+                                    <v>3765</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>48</b>
+                                    <v>3707</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>74</b>
+                                    <v>3661</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>102</b>
+                                    <v>3545</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>119</b>
+                                    <v>3696</v>
+                                </b>
+                                <b>
+                                    <a>119</a>
+                                    <b>146</b>
+                                    <v>1413</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>inmacroexpansion</name>
+            <cardinality>109305879</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>17940692</v>
+                </e>
+                <e>
+                    <k>inv</k>
+                    <v>2681885</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>inv</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>3</b>
+                                    <v>1565908</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1071272</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1179734</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>4799673</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>6358947</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>2595071</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>150</b>
+                                    <v>370084</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>inv</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>371830</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>540079</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>349893</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>199801</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>206276</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>240865</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>2201</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>324110</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>337</b>
+                                    <v>223895</v>
+                                </b>
+                                <b>
+                                    <a>339</a>
+                                    <b>422</b>
+                                    <v>201369</v>
+                                </b>
+                                <b>
+                                    <a>422</a>
+                                    <b>7616</b>
+                                    <v>21561</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>affectedbymacroexpansion</name>
+            <cardinality>35538114</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>5134928</v>
+                </e>
+                <e>
+                    <k>inv</k>
+                    <v>2772993</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>inv</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2804021</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>557759</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>263786</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>563401</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>390245</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>50</b>
+                                    <v>405678</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>9900</b>
+                                    <v>150035</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>inv</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>4</b>
+                                    <v>228146</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>230808</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>219545</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>250025</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>332565</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>164888</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>297580</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>121327</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>275438</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>146319</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>251068</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>25</b>
+                                    <v>208095</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>109</b>
+                                    <v>47183</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>macroinvocations</name>
+            <cardinality>34062185</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>34062185</v>
+                </e>
+                <e>
+                    <k>macro_id</k>
+                    <v>81572</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>779877</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>23</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>macro_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34062185</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34062185</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34062185</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>macro_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16835</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>17322</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3846</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>7323</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>7265</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>21</b>
+                                    <v>6546</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>47</b>
+                                    <v>6257</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>143</b>
+                                    <v>6117</v>
+                                </b>
+                                <b>
+                                    <a>143</a>
+                                    <b>934</b>
+                                    <v>6152</v>
+                                </b>
+                                <b>
+                                    <a>934</a>
+                                    <b>168391</b>
+                                    <v>3904</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>macro_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>43648</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10648</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5295</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>7010</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>13</b>
+                                    <v>6627</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>66</b>
+                                    <v>6152</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>3614</b>
+                                    <v>2189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>macro_id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>75732</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5839</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>297219</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>195287</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>48978</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>57610</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>59059</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>59267</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>934</b>
+                                    <v>58572</v>
+                                </b>
+                                <b>
+                                    <a>942</a>
+                                    <b>244474</b>
+                                    <v>3881</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>macro_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>732509</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>350</b>
+                                    <v>47367</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>779877</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>21085</a>
+                                    <b>21086</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>2918595</a>
+                                    <b>2918596</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>macro_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2123</a>
+                                    <b>2124</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>5421</a>
+                                    <b>5422</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6289</a>
+                                    <b>6290</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>61017</a>
+                                    <b>61018</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>macroparent</name>
+            <cardinality>30544569</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>30544569</v>
+                </e>
+                <e>
+                    <k>parent_id</k>
+                    <v>23768631</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>parent_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30544569</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18363231</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4552338</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>88</b>
+                                    <v>853060</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>macrolocationbind</name>
+            <cardinality>3984360</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2778691</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>1988314</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2182951</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>336419</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>229799</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>57</b>
+                                    <v>29521</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1589477</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>169635</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>154222</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>723</b>
+                                    <v>74979</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>macro_argument_unexpanded</name>
+            <cardinality>86422356</cardinality>
+            <columnsizes>
+                <e>
+                    <k>invocation</k>
+                    <v>26658798</v>
+                </e>
+                <e>
+                    <k>argument_index</k>
+                    <v>764</v>
+                </e>
+                <e>
+                    <k>text</k>
+                    <v>326615</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>invocation</src>
+                    <trg>argument_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7473686</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10892801</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6274590</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>67</b>
+                                    <v>2017720</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>invocation</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7545213</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11043502</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6104017</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>67</b>
+                                    <v>1966065</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>argument_index</src>
+                    <trg>invocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>41253</a>
+                                    <b>41254</b>
+                                    <v>672</v>
+                                </b>
+                                <b>
+                                    <a>41455</a>
+                                    <b>174137</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>715654</a>
+                                    <b>2300744</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>argument_index</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>672</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>995</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>6559</a>
+                                    <b>19569</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>invocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39998</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>66161</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>14947</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>44065</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>24761</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>18643</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>16</b>
+                                    <v>22281</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>23</b>
+                                    <v>26673</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>43</b>
+                                    <v>24784</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>164</b>
+                                    <v>24506</v>
+                                </b>
+                                <b>
+                                    <a>164</a>
+                                    <b>521728</b>
+                                    <v>19790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>argument_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>236190</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>79869</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>10555</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>macro_argument_expanded</name>
+            <cardinality>86422356</cardinality>
+            <columnsizes>
+                <e>
+                    <k>invocation</k>
+                    <v>26658798</v>
+                </e>
+                <e>
+                    <k>argument_index</k>
+                    <v>764</v>
+                </e>
+                <e>
+                    <k>text</k>
+                    <v>197906</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>invocation</src>
+                    <trg>argument_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7473686</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10892801</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6274590</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>67</b>
+                                    <v>2017720</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>invocation</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10794971</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9400379</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5321625</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>1141821</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>argument_index</src>
+                    <trg>invocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>41253</a>
+                                    <b>41254</b>
+                                    <v>672</v>
+                                </b>
+                                <b>
+                                    <a>41455</a>
+                                    <b>174137</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>715654</a>
+                                    <b>2300744</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>argument_index</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>660</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>76</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>870</a>
+                                    <b>13871</b>
+                                    <v>46</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>invocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24008</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>41238</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6940</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>15874</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3835</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>23324</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>15457</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>17345</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>30</b>
+                                    <v>14842</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>89</b>
+                                    <v>14947</v>
+                                </b>
+                                <b>
+                                    <a>90</a>
+                                    <b>505</b>
+                                    <v>14854</v>
+                                </b>
+                                <b>
+                                    <a>510</a>
+                                    <b>1054483</b>
+                                    <v>5237</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>argument_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>100112</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>83009</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>66</b>
+                                    <v>14785</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>functions</name>
+            <cardinality>4759741</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4759741</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1941845</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>3304</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4759741</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4759741</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1523173</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>153875</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>151986</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>1754</b>
+                                    <v>112810</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1941373</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>173</a>
+                                    <b>174</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>195</a>
+                                    <b>196</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1365</a>
+                                    <b>1366</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2462</a>
+                                    <b>2463</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>5819</a>
+                                    <b>5820</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>94</a>
+                                    <b>95</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>195</a>
+                                    <b>196</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>246</a>
+                                    <b>247</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3505</a>
+                                    <b>3506</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>function_entry_point</name>
+            <cardinality>1180967</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1171054</v>
+                </e>
+                <e>
+                    <k>entry_point</k>
+                    <v>1180967</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>entry_point</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1161142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9912</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>entry_point</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1180967</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>function_return_type</name>
+            <cardinality>4768237</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4759741</v>
+                </e>
+                <e>
+                    <k>return_type</k>
+                    <v>1027092</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>return_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4752660</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>7080</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>return_type</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>524874</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>398847</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>11</b>
+                                    <v>78825</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>2523</b>
+                                    <v>24544</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>coroutine</name>
+            <cardinality>2</cardinality>
+            <columnsizes>
+                <e>
+                    <k>function</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>traits</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>handle</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>promise</k>
+                    <v>2</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>function</src>
+                    <trg>traits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>handle</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>promise</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>traits</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>traits</src>
+                    <trg>handle</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>traits</src>
+                    <trg>promise</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>handle</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>handle</src>
+                    <trg>traits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>handle</src>
+                    <trg>promise</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>promise</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>promise</src>
+                    <trg>traits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>promise</src>
+                    <trg>handle</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>coroutine_new</name>
+            <cardinality>2</cardinality>
+            <columnsizes>
+                <e>
+                    <k>function</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>new</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>function</src>
+                    <trg>new</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>new</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>coroutine_delete</name>
+            <cardinality>2</cardinality>
+            <columnsizes>
+                <e>
+                    <k>function</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>delete</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>function</src>
+                    <trg>delete</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>delete</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>purefunctions</name>
+            <cardinality>99735</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>99735</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>function_deleted</name>
+            <cardinality>141130</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>141130</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>function_defaulted</name>
+            <cardinality>74577</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>74577</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>member_function_this_type</name>
+            <cardinality>549916</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>549916</v>
+                </e>
+                <e>
+                    <k>this_type</k>
+                    <v>188354</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>this_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>549916</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>this_type</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>68044</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>45024</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>30331</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>15428</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>15497</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>66</b>
+                                    <v>14028</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fun_decls</name>
+            <cardinality>5136876</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>5131684</v>
+                </e>
+                <e>
+                    <k>function</k>
+                    <v>4611530</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>1023788</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1843196</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>3473987</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5131684</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5126492</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5192</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5131684</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5131684</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4172561</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>364391</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>74577</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4569521</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>42008</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4611530</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4229674</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>380439</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>447464</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>462097</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>79769</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>2775</b>
+                                    <v>34456</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>532426</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>390351</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>11</b>
+                                    <v>77409</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>2484</b>
+                                    <v>23600</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>893985</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>90625</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>824</b>
+                                    <v>39176</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>789199</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>133578</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>11</b>
+                                    <v>78353</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>2032</b>
+                                    <v>22656</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1250824</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>269517</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>80713</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>139714</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>1788</b>
+                                    <v>102426</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1432076</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>152930</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>146322</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>1738</b>
+                                    <v>111866</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1622295</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>135466</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>969</b>
+                                    <v>85433</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1272064</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>297365</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>79769</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>139714</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>666</b>
+                                    <v>54281</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3005754</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>304445</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>55</b>
+                                    <v>163787</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3073724</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>270933</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>55</b>
+                                    <v>129330</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3256863</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>27</b>
+                                    <v>217124</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3296512</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>13</b>
+                                    <v>177475</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fun_def</name>
+            <cardinality>1970638</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1970638</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>fun_specialized</name>
+            <cardinality>26432</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>26432</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>fun_implicit</name>
+            <cardinality>198</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>198</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>fun_decl_specifiers</name>
+            <cardinality>2947225</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1716697</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>2832</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>505049</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1192767</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>18880</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>203</a>
+                                    <b>204</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>209</a>
+                                    <b>210</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>657</a>
+                                    <b>658</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2561</a>
+                                    <b>2562</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2564</a>
+                                    <b>2565</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fun_decl_throws</name>
+            <cardinality>7</cardinality>
+            <columnsizes>
+                <e>
+                    <k>fun_decl</k>
+                    <v>7</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>2</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>fun_decl</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fun_decl</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>fun_decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>fun_decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fun_decl_empty_throws</name>
+            <cardinality>2002263</cardinality>
+            <columnsizes>
+                <e>
+                    <k>fun_decl</k>
+                    <v>2002263</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>fun_decl_noexcept</name>
+            <cardinality>61343</cardinality>
+            <columnsizes>
+                <e>
+                    <k>fun_decl</k>
+                    <v>61343</v>
+                </e>
+                <e>
+                    <k>constant</k>
+                    <v>61238</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>fun_decl</src>
+                    <trg>constant</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61343</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>constant</src>
+                    <trg>fun_decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61133</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fun_decl_empty_noexcept</name>
+            <cardinality>890209</cardinality>
+            <columnsizes>
+                <e>
+                    <k>fun_decl</k>
+                    <v>890209</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>fun_decl_typedef_type</name>
+            <cardinality>2891</cardinality>
+            <columnsizes>
+                <e>
+                    <k>fun_decl</k>
+                    <v>2891</v>
+                </e>
+                <e>
+                    <k>typedeftype_id</k>
+                    <v>130</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>fun_decl</src>
+                    <trg>typedeftype_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2891</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>typedeftype_id</src>
+                    <trg>fun_decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>12</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>13</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>12</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>43</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>55</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>87</a>
+                                    <b>128</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>158</a>
+                                    <b>159</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>param_decl_bind</name>
+            <cardinality>7511554</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>7511554</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>8024</v>
+                </e>
+                <e>
+                    <k>fun_decl</k>
+                    <v>4315108</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7511554</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fun_decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7511554</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>78</a>
+                                    <b>79</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>245</a>
+                                    <b>246</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>636</a>
+                                    <b>637</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1713</a>
+                                    <b>1714</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3991</a>
+                                    <b>3992</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>9142</a>
+                                    <b>9143</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>fun_decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>78</a>
+                                    <b>79</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>245</a>
+                                    <b>246</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>636</a>
+                                    <b>637</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1713</a>
+                                    <b>1714</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3991</a>
+                                    <b>3992</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>9142</a>
+                                    <b>9143</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fun_decl</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2431319</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1075237</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>508353</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>18</b>
+                                    <v>300197</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fun_decl</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2431319</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1075237</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>508353</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>18</b>
+                                    <v>300197</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>var_decls</name>
+            <cardinality>8655233</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>8586319</v>
+                </e>
+                <e>
+                    <k>variable</k>
+                    <v>7559699</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>2453031</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>674973</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>5383265</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>variable</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8586319</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8517406</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>68913</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8586319</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8586319</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>variable</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6694978</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>709429</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>155291</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>variable</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7386000</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>173699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>variable</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7442169</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>117530</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>variable</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7005089</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>554610</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1525061</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>517794</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>99121</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>189275</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>780</b>
+                                    <v>121778</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>variable</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1660056</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>492777</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>188803</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>742</b>
+                                    <v>111394</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1939485</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>389879</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>128</b>
+                                    <v>123666</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1763898</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>408287</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>190691</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>595</b>
+                                    <v>90153</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>345038</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>87793</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>49088</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>52393</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>52865</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>33</b>
+                                    <v>50976</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>3311</b>
+                                    <v>36816</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>variable</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>372887</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>78825</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>45784</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>50032</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>53809</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>56</b>
+                                    <v>51449</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>3228</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>462097</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>94873</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>47200</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>19</b>
+                                    <v>51449</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>2009</b>
+                                    <v>19352</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>383271</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>91569</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>60417</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>51921</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>21</b>
+                                    <v>50976</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>1020</b>
+                                    <v>36816</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4551113</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>552250</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>1813</b>
+                                    <v>279901</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>variable</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4956568</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>415840</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>1809</b>
+                                    <v>10856</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5033506</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1591</b>
+                                    <v>349758</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5379017</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>24</b>
+                                    <v>4248</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>var_def</name>
+            <cardinality>4097512</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4097512</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>var_decl_specifiers</name>
+            <cardinality>336070</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>336070</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1416</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>336070</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>67</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>631</a>
+                                    <b>632</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>is_structured_binding</name>
+            <cardinality>10</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>10</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>type_decls</name>
+            <cardinality>3292736</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>3292736</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>3241759</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>3212494</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3292736</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3292736</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3199750</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>42008</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3199750</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>42008</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3171430</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>20</b>
+                                    <v>41064</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3171430</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>20</b>
+                                    <v>41064</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>type_def</name>
+            <cardinality>2666852</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2666852</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>type_decl_top</name>
+            <cardinality>758990</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_decl</k>
+                    <v>758990</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>namespace_decls</name>
+            <cardinality>307863</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>307863</v>
+                </e>
+                <e>
+                    <k>namespace_id</k>
+                    <v>1418</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>307863</v>
+                </e>
+                <e>
+                    <k>bodylocation</k>
+                    <v>307863</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>namespace_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>bodylocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>296</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>157</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>126</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>30</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>57</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>80</b>
+                                    <v>113</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>127</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>129</a>
+                                    <b>199</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>201</a>
+                                    <b>504</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>512</a>
+                                    <b>12128</b>
+                                    <v>69</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>296</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>157</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>126</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>30</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>57</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>80</b>
+                                    <v>113</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>127</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>129</a>
+                                    <b>199</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>201</a>
+                                    <b>504</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>512</a>
+                                    <b>12128</b>
+                                    <v>69</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace_id</src>
+                    <trg>bodylocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>296</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>157</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>126</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>30</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>57</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>57</a>
+                                    <b>80</b>
+                                    <v>113</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>127</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>129</a>
+                                    <b>199</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>201</a>
+                                    <b>504</b>
+                                    <v>107</v>
+                                </b>
+                                <b>
+                                    <a>512</a>
+                                    <b>12128</b>
+                                    <v>69</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>namespace_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>bodylocation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bodylocation</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bodylocation</src>
+                    <trg>namespace_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bodylocation</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>307863</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>usings</name>
+            <cardinality>375719</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>375719</v>
+                </e>
+                <e>
+                    <k>element_id</k>
+                    <v>319078</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>250164</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>element_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>375719</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>375719</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>264325</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53337</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>264325</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53337</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>203907</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>31624</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>3304</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>element_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>203907</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>11328</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>31624</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>3304</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>using_container</name>
+            <cardinality>479100</cardinality>
+            <columnsizes>
+                <e>
+                    <k>parent</k>
+                    <v>11308</v>
+                </e>
+                <e>
+                    <k>child</k>
+                    <v>303777</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>parent</src>
+                    <trg>child</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3348</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>961</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>428</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>2560</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>926</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>143</b>
+                                    <v>787</v>
+                                </b>
+                                <b>
+                                    <a>178</a>
+                                    <b>179</b>
+                                    <v>1332</v>
+                                </b>
+                                <b>
+                                    <a>179</a>
+                                    <b>183</b>
+                                    <v>880</v>
+                                </b>
+                                <b>
+                                    <a>201</a>
+                                    <b>488</b>
+                                    <v>81</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>224046</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53091</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>11</b>
+                                    <v>24448</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>41</b>
+                                    <v>2189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>static_asserts</name>
+            <cardinality>130790</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>130790</v>
+                </e>
+                <e>
+                    <k>condition</k>
+                    <v>130790</v>
+                </e>
+                <e>
+                    <k>message</k>
+                    <v>29535</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>16816</v>
+                </e>
+                <e>
+                    <k>enclosing</k>
+                    <v>1948</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>condition</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>enclosing</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>condition</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>condition</src>
+                    <trg>message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>condition</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>condition</src>
+                    <trg>enclosing</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>130790</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>message</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22006</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>403</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2774</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>11</b>
+                                    <v>1425</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>17</b>
+                                    <v>2383</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>513</b>
+                                    <v>542</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>message</src>
+                    <trg>condition</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22006</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>403</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2774</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>11</b>
+                                    <v>1425</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>17</b>
+                                    <v>2383</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>513</b>
+                                    <v>542</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>message</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>27416</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>33</b>
+                                    <v>2118</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>message</src>
+                    <trg>enclosing</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23425</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>189</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2572</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>11</b>
+                                    <v>1267</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>21</b>
+                                    <v>2080</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3133</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2705</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1311</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3632</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>13</b>
+                                    <v>182</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>2055</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>37</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>3411</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>52</b>
+                                    <v>346</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>condition</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3133</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2705</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1311</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3632</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>13</b>
+                                    <v>182</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>2055</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>37</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>3411</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>52</b>
+                                    <v>346</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4634</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5958</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6040</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>182</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>enclosing</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3739</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6129</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1084</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3600</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>189</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>2055</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>21</b>
+                                    <v>18</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>enclosing</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1380</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>138</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>10</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>180</b>
+                                    <v>138</v>
+                                </b>
+                                <b>
+                                    <a>209</a>
+                                    <b>11052</b>
+                                    <v>126</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>enclosing</src>
+                    <trg>condition</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1380</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>138</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>10</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>180</b>
+                                    <v>138</v>
+                                </b>
+                                <b>
+                                    <a>209</a>
+                                    <b>11052</b>
+                                    <v>126</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>enclosing</src>
+                    <trg>message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1551</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>151</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>210</b>
+                                    <v>170</v>
+                                </b>
+                                <b>
+                                    <a>223</a>
+                                    <b>2936</b>
+                                    <v>75</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>enclosing</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1538</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>157</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>210</b>
+                                    <v>176</v>
+                                </b>
+                                <b>
+                                    <a>223</a>
+                                    <b>1929</b>
+                                    <v>75</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>params</name>
+            <cardinality>6863014</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>6696867</v>
+                </e>
+                <e>
+                    <k>function</k>
+                    <v>3967709</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>8024</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>2256204</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6696867</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6696867</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6571312</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>125554</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2325117</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>963842</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>434720</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>18</b>
+                                    <v>244028</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2325117</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>963842</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>434720</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>18</b>
+                                    <v>244028</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2628619</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>834040</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>350702</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>154347</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>194</a>
+                                    <b>195</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>517</a>
+                                    <b>518</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1438</a>
+                                    <b>1439</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3480</a>
+                                    <b>3481</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8406</a>
+                                    <b>8407</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>194</a>
+                                    <b>195</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>517</a>
+                                    <b>518</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1438</a>
+                                    <b>1439</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3480</a>
+                                    <b>3481</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8406</a>
+                                    <b>8407</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>228</a>
+                                    <b>229</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>582</a>
+                                    <b>583</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1275</a>
+                                    <b>1276</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3696</a>
+                                    <b>3697</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1544886</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>447936</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>172283</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>522</b>
+                                    <v>91097</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>function</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1769090</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>251580</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>170395</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>506</b>
+                                    <v>65137</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1821955</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>354478</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>13</b>
+                                    <v>79769</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>overrides</name>
+            <cardinality>160287</cardinality>
+            <columnsizes>
+                <e>
+                    <k>new</k>
+                    <v>125386</v>
+                </e>
+                <e>
+                    <k>old</k>
+                    <v>15139</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>new</src>
+                    <trg>old</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>90491</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>34888</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>old</src>
+                    <trg>new</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7945</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1910</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>989</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1324</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>1216</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>60</b>
+                                    <v>1166</v>
+                                </b>
+                                <b>
+                                    <a>61</a>
+                                    <b>231</b>
+                                    <v>586</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>membervariables</name>
+            <cardinality>1051799</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1050009</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>326270</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>449611</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1048298</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>1710</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1050009</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>241948</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>51667</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>10</b>
+                                    <v>25415</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>4152</b>
+                                    <v>7238</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>254119</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>46257</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>40</b>
+                                    <v>24501</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>2031</b>
+                                    <v>1392</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>294013</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>86151</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>41007</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>646</b>
+                                    <v>28438</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>366204</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>51508</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>650</b>
+                                    <v>31899</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>globalvariables</name>
+            <cardinality>300716</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>300708</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>1405</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>294738</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>300700</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>300708</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>977</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>114</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>77</b>
+                                    <v>106</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>169397</b>
+                                    <v>49</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1010</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>135</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>112</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>105</b>
+                                    <v>106</v>
+                                </b>
+                                <b>
+                                    <a>106</a>
+                                    <b>168448</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>290989</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>33</b>
+                                    <v>3749</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>294142</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>12</b>
+                                    <v>596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>localvariables</name>
+            <cardinality>581746</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>581746</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>37913</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>91411</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>581746</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>581746</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21213</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5413</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2479</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>3413</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>18</b>
+                                    <v>2879</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>15847</b>
+                                    <v>2513</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>27001</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4606</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>2946</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>31</b>
+                                    <v>2845</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>3455</b>
+                                    <v>512</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>57575</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>14421</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>8389</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>15</b>
+                                    <v>7048</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>5176</b>
+                                    <v>3976</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>77221</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7481</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>1486</b>
+                                    <v>6708</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>autoderivation</name>
+            <cardinality>149996</cardinality>
+            <columnsizes>
+                <e>
+                    <k>var</k>
+                    <v>149996</v>
+                </e>
+                <e>
+                    <k>derivation_type</k>
+                    <v>525</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>var</src>
+                    <trg>derivation_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>149996</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>derivation_type</src>
+                    <trg>var</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>90</a>
+                                    <b>91</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>353</a>
+                                    <b>354</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>392</a>
+                                    <b>393</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>560</a>
+                                    <b>561</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>enumconstants</name>
+            <cardinality>240596</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>240596</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>28399</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>10182</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>39</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>240318</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>220589</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>994</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4017</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5767</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3897</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3062</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1829</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1471</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>2585</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>2346</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>84</b>
+                                    <v>2147</v>
+                                </b>
+                                <b>
+                                    <a>94</a>
+                                    <b>257</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>994</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4017</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5767</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3897</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3062</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1829</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1471</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>2585</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>2346</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>84</b>
+                                    <v>2147</v>
+                                </b>
+                                <b>
+                                    <a>94</a>
+                                    <b>257</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28399</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>994</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4017</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5767</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3897</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3062</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1829</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1471</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>2585</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>2346</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>84</b>
+                                    <v>2147</v>
+                                </b>
+                                <b>
+                                    <a>94</a>
+                                    <b>257</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1431</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4176</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5807</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>3858</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3062</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>1789</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1392</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>2505</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>2227</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>257</b>
+                                    <v>2147</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2028</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>835</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>69</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>715</b>
+                                    <v>596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2028</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>835</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>69</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>715</b>
+                                    <v>596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10182</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2028</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>835</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>69</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>712</b>
+                                    <v>596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2028</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1750</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>9</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>835</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>875</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>69</b>
+                                    <v>795</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>715</b>
+                                    <v>596</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6049</a>
+                                    <b>6050</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>714</a>
+                                    <b>715</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>256</a>
+                                    <b>257</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6042</a>
+                                    <b>6043</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>5546</a>
+                                    <b>5547</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240039</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240039</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240318</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240318</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>240039</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>278</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>219834</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>205</b>
+                                    <v>755</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>220589</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>219834</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>205</b>
+                                    <v>755</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>220589</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>219834</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>205</b>
+                                    <v>755</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>builtintypes</name>
+            <cardinality>22184</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>22184</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>22184</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>22184</v>
+                </e>
+                <e>
+                    <k>size</k>
+                    <v>3304</v>
+                </e>
+                <e>
+                    <k>sign</k>
+                    <v>1416</v>
+                </e>
+                <e>
+                    <k>alignment</k>
+                    <v>2360</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>sign</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>sign</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>sign</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>sign</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2360</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sign</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sign</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sign</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sign</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sign</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>sign</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>derivedtypes</name>
+            <cardinality>4456239</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4456239</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>2235907</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>2832</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>2752285</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4456239</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4456239</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4456239</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1961670</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>175587</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>1173</b>
+                                    <v>98649</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2234963</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1961670</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>175587</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>1155</b>
+                                    <v>98649</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>198</a>
+                                    <b>199</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1118</a>
+                                    <b>1119</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1154</a>
+                                    <b>1155</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1223</a>
+                                    <b>1224</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2208</a>
+                                    <b>2209</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3540</a>
+                                    <b>3541</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>164</a>
+                                    <b>165</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>611</a>
+                                    <b>612</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>796</a>
+                                    <b>797</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1161</a>
+                                    <b>1162</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2006</a>
+                                    <b>2007</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>83</a>
+                                    <b>84</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1118</a>
+                                    <b>1119</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1154</a>
+                                    <b>1155</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1223</a>
+                                    <b>1224</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2163</a>
+                                    <b>2164</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3540</a>
+                                    <b>3541</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1698289</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>570659</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>375719</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>54</b>
+                                    <v>107618</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1709617</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>563107</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>372887</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>54</b>
+                                    <v>106674</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1702537</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>574435</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>374775</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>100537</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>pointerishsize</name>
+            <cardinality>3320584</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>3320584</v>
+                </e>
+                <e>
+                    <k>size</k>
+                    <v>472</v>
+                </e>
+                <e>
+                    <k>alignment</k>
+                    <v>472</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3320584</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3320584</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>7035</a>
+                                    <b>7036</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>7035</a>
+                                    <b>7036</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>arraysizes</name>
+            <cardinality>71745</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>71745</v>
+                </e>
+                <e>
+                    <k>num_elements</k>
+                    <v>23600</v>
+                </e>
+                <e>
+                    <k>bytesize</k>
+                    <v>26432</v>
+                </e>
+                <e>
+                    <k>alignment</k>
+                    <v>1888</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>num_elements</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>71745</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>bytesize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>71745</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>71745</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_elements</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2360</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15104</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_elements</src>
+                    <trg>bytesize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18408</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2360</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num_elements</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18408</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bytesize</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16992</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>2360</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>16</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bytesize</src>
+                    <trg>num_elements</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21712</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bytesize</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22184</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>100</a>
+                                    <b>101</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>num_elements</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>bytesize</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>typedefbase</name>
+            <cardinality>1731312</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1731312</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>809076</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1731312</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>628341</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>84469</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>64632</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>5443</b>
+                                    <v>31632</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>decltypes</name>
+            <cardinality>354722</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>23891</v>
+                </e>
+                <e>
+                    <k>expr</k>
+                    <v>354722</v>
+                </e>
+                <e>
+                    <k>base_type</k>
+                    <v>17137</v>
+                </e>
+                <e>
+                    <k>parentheses_would_change_meaning</k>
+                    <v>17</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5945</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7472</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3251</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>1993</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>18</b>
+                                    <v>1993</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>42</b>
+                                    <v>2011</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>1767</b>
+                                    <v>1221</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>base_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23891</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>parentheses_would_change_meaning</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23891</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>354722</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>base_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>354722</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>parentheses_would_change_meaning</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>354722</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>base_type</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14442</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2209</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>149</b>
+                                    <v>485</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>base_type</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1796</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7329</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3071</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1419</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>1365</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>43</b>
+                                    <v>1562</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>6569</b>
+                                    <v>592</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>base_type</src>
+                    <trg>parentheses_would_change_meaning</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17137</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentheses_would_change_meaning</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1330</a>
+                                    <b>1331</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentheses_would_change_meaning</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>19747</a>
+                                    <b>19748</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentheses_would_change_meaning</src>
+                    <trg>base_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>954</a>
+                                    <b>955</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>usertypes</name>
+            <cardinality>5362968</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>5362968</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1392427</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>5192</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5362968</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5362968</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1009627</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>162371</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>108562</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>81</b>
+                                    <v>104786</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>885</b>
+                                    <v>7080</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1247992</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>128858</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>15576</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>121</a>
+                                    <b>122</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>138</a>
+                                    <b>139</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>690</a>
+                                    <b>691</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>862</a>
+                                    <b>863</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>963</a>
+                                    <b>964</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1770</a>
+                                    <b>1771</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1913</a>
+                                    <b>1914</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4863</a>
+                                    <b>4864</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>31</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>124</a>
+                                    <b>125</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>269</a>
+                                    <b>270</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>373</a>
+                                    <b>374</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>433</a>
+                                    <b>434</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>749</a>
+                                    <b>750</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1250</a>
+                                    <b>1251</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>usertypesize</name>
+            <cardinality>1766258</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1766258</v>
+                </e>
+                <e>
+                    <k>size</k>
+                    <v>13688</v>
+                </e>
+                <e>
+                    <k>alignment</k>
+                    <v>2360</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1766258</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1766258</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4248</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>84</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>160</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>748</a>
+                                    <b>2552</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>size</src>
+                    <trg>alignment</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10384</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>181</a>
+                                    <b>182</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>254</a>
+                                    <b>255</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3299</a>
+                                    <b>3300</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alignment</src>
+                    <trg>size</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>usertype_final</name>
+            <cardinality>9558</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>9558</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>usertype_uuid</name>
+            <cardinality>36206</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>36206</v>
+                </e>
+                <e>
+                    <k>uuid</k>
+                    <v>36206</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>uuid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>36206</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>uuid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>36206</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>mangled_name</name>
+            <cardinality>5283199</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>5283199</v>
+                </e>
+                <e>
+                    <k>mangled_name</k>
+                    <v>1236664</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>mangled_name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5283199</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>mangled_name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>733502</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>178419</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>82601</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>85905</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>99121</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>885</b>
+                                    <v>57113</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>is_pod_class</name>
+            <cardinality>559630</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>559630</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>is_standard_layout_class</name>
+            <cardinality>1306521</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1306521</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>is_complete</name>
+            <cardinality>1706313</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1706313</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>is_class_template</name>
+            <cardinality>406871</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>406871</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>class_instantiation</name>
+            <cardinality>1132350</cardinality>
+            <columnsizes>
+                <e>
+                    <k>to</k>
+                    <v>1132350</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>171811</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>to</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1132350</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>to</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>60417</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>29736</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16048</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>14160</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>15576</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>14</b>
+                                    <v>15576</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>34</b>
+                                    <v>13216</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>84</b>
+                                    <v>7080</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>class_template_argument</name>
+            <cardinality>2984763</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>1362392</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>1297</v>
+                </e>
+                <e>
+                    <k>arg_type</k>
+                    <v>873917</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>553906</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>419705</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>242829</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>121721</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>113</b>
+                                    <v>24228</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>578853</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>432393</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>256363</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>113</b>
+                                    <v>94781</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>822</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>26</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>64</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>69</a>
+                                    <b>411</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>592</a>
+                                    <b>8760</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>12939</a>
+                                    <b>114739</b>
+                                    <v>46</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>822</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>14</b>
+                                    <v>115</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>26</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>145</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>195</a>
+                                    <b>3458</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>11165</a>
+                                    <b>39733</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>536062</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>191313</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>53972</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>11</b>
+                                    <v>67088</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>10817</b>
+                                    <v>25479</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>762763</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>94156</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>22</b>
+                                    <v>16998</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>class_template_argument_value</name>
+            <cardinality>506465</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>314830</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>1888</v>
+                </e>
+                <e>
+                    <k>arg_value</k>
+                    <v>506465</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>259133</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53809</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1888</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>199187</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>81185</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12272</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>22184</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>92</a>
+                                    <b>93</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>299</a>
+                                    <b>300</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>380</a>
+                                    <b>381</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>124</a>
+                                    <b>125</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>410</a>
+                                    <b>411</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>520</a>
+                                    <b>521</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>506465</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>506465</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>is_proxy_class_for</name>
+            <cardinality>65137</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>65137</v>
+                </e>
+                <e>
+                    <k>templ_param_id</k>
+                    <v>65137</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>templ_param_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>65137</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>templ_param_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>65137</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>type_mentions</name>
+            <cardinality>4011226</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4011226</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>197321</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>3977856</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>39</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4011226</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4011226</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4011226</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>97169</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>21637</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>10739</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>14318</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>15790</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>27</b>
+                                    <v>15114</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>8555</b>
+                                    <v>14358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>97169</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>21637</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>8193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>10739</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>14318</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>15790</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>27</b>
+                                    <v>15114</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>8555</b>
+                                    <v>14358</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>197321</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3944485</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>33370</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3944485</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>33370</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3977856</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>100849</a>
+                                    <b>100850</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4961</a>
+                                    <b>4962</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>100010</a>
+                                    <b>100011</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>is_function_template</name>
+            <cardinality>1418387</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1418387</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>function_instantiation</name>
+            <cardinality>895034</cardinality>
+            <columnsizes>
+                <e>
+                    <k>to</k>
+                    <v>895034</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>144729</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>to</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>895034</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>to</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>100124</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>14448</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>11964</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>21</b>
+                                    <v>11964</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>864</b>
+                                    <v>6227</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>function_template_argument</name>
+            <cardinality>2313992</cardinality>
+            <columnsizes>
+                <e>
+                    <k>function_id</k>
+                    <v>1303055</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>559</v>
+                </e>
+                <e>
+                    <k>arg_type</k>
+                    <v>302683</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>function_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>668792</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>388709</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>175375</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>15</b>
+                                    <v>70178</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function_id</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>683870</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>393991</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>146583</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>9</b>
+                                    <v>78609</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>function_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>209</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>36</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>109</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>164</a>
+                                    <b>165</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>294</a>
+                                    <b>295</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>849</a>
+                                    <b>850</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>3198</a>
+                                    <b>3199</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>8582</a>
+                                    <b>8583</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>17395</a>
+                                    <b>17396</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>34286</a>
+                                    <b>34287</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>209</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>31</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>61</a>
+                                    <b>62</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>134</a>
+                                    <b>135</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>452</a>
+                                    <b>453</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1127</a>
+                                    <b>1128</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>2404</a>
+                                    <b>2405</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>5836</a>
+                                    <b>5837</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>function_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>185521</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>44534</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>23334</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>16</b>
+                                    <v>23369</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>113</b>
+                                    <v>25118</v>
+                                </b>
+                                <b>
+                                    <a>126</a>
+                                    <b>955</b>
+                                    <v>804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>272771</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>25818</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>17</b>
+                                    <v>4093</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>function_template_argument_value</name>
+            <cardinality>358342</cardinality>
+            <columnsizes>
+                <e>
+                    <k>function_id</k>
+                    <v>179083</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>559</v>
+                </e>
+                <e>
+                    <k>arg_value</k>
+                    <v>355719</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>function_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>169778</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>9305</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>function_id</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>149417</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20535</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>97</b>
+                                    <v>9130</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>function_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>209</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>94</a>
+                                    <b>95</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>314</a>
+                                    <b>315</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>709</a>
+                                    <b>710</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>964</a>
+                                    <b>965</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1187</a>
+                                    <b>1188</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>2148</a>
+                                    <b>2149</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>209</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>60</a>
+                                    <b>61</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>141</a>
+                                    <b>142</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>533</a>
+                                    <b>534</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1550</a>
+                                    <b>1551</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1821</a>
+                                    <b>1822</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>2202</a>
+                                    <b>2203</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>3771</a>
+                                    <b>3772</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>function_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>353095</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2623</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>355719</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>is_variable_template</name>
+            <cardinality>42225</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>42225</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>variable_instantiation</name>
+            <cardinality>48633</cardinality>
+            <columnsizes>
+                <e>
+                    <k>to</k>
+                    <v>48633</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>24894</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>to</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>48633</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>to</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14390</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7667</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>1785</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>1050</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>variable_template_argument</name>
+            <cardinality>328248</cardinality>
+            <columnsizes>
+                <e>
+                    <k>variable_id</k>
+                    <v>26469</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>1785</v>
+                </e>
+                <e>
+                    <k>arg_type</k>
+                    <v>217116</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>variable_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16176</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5672</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3886</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>17</b>
+                                    <v>735</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>variable_id</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5987</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5251</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1995</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1155</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>2415</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>2310</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>2205</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>2415</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>67</b>
+                                    <v>1995</v>
+                                </b>
+                                <b>
+                                    <a>80</a>
+                                    <b>515</b>
+                                    <v>735</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>variable_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>420</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>28</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>80</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>248</a>
+                                    <b>249</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>315</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>33</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>436</a>
+                                    <b>437</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>636</a>
+                                    <b>637</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>890</a>
+                                    <b>891</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>variable_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>181088</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20902</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>37</b>
+                                    <v>15125</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>199890</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>16806</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>420</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>variable_template_argument_value</name>
+            <cardinality>15650</cardinality>
+            <columnsizes>
+                <e>
+                    <k>variable_id</k>
+                    <v>2836</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>420</v>
+                </e>
+                <e>
+                    <k>arg_value</k>
+                    <v>12079</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>variable_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2625</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>variable_id</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>420</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1365</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>17</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>variable_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>31</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>41</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>variable_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8508</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3571</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12079</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>routinetypes</name>
+            <cardinality>543059</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>543059</v>
+                </e>
+                <e>
+                    <k>return_type</k>
+                    <v>283826</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>return_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>543059</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>return_type</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>247373</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>21165</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>3594</b>
+                                    <v>15288</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>routinetypeargs</name>
+            <cardinality>996883</cardinality>
+            <columnsizes>
+                <e>
+                    <k>routine</k>
+                    <v>430472</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>8024</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>230340</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>routine</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>156235</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>135938</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>64193</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>46256</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>18</b>
+                                    <v>27848</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>routine</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>186443</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>135466</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>59473</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>33984</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>11</b>
+                                    <v>15104</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>routine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>29</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>59</a>
+                                    <b>60</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>157</a>
+                                    <b>158</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>293</a>
+                                    <b>294</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>581</a>
+                                    <b>582</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>912</a>
+                                    <b>913</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>48</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>90</a>
+                                    <b>91</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>176</a>
+                                    <b>177</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>349</a>
+                                    <b>350</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>routine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>149154</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>31152</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>16992</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>18408</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>113</b>
+                                    <v>14632</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>175587</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>31152</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>18880</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>4720</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>ptrtomembers</name>
+            <cardinality>38232</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>38232</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>38232</v>
+                </e>
+                <e>
+                    <k>class_id</k>
+                    <v>15576</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38232</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>class_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38232</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38232</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>class_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38232</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>class_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13688</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>29</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>class_id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13688</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>29</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>specifiers</name>
+            <cardinality>25016</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>25016</v>
+                </e>
+                <e>
+                    <k>str</k>
+                    <v>25016</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>str</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>25016</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>str</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>25016</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>typespecifiers</name>
+            <cardinality>1326345</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>1307937</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>3776</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1289529</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>18408</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>86</a>
+                                    <b>87</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>105</a>
+                                    <b>106</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>219</a>
+                                    <b>220</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>221</a>
+                                    <b>222</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>2084</a>
+                                    <b>2085</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>funspecifiers</name>
+            <cardinality>12993924</cardinality>
+            <columnsizes>
+                <e>
+                    <k>func_id</k>
+                    <v>3955310</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>699</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>func_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>312758</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>540295</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1132682</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1734095</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>235478</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>func_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>98</a>
+                                    <b>99</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>200</a>
+                                    <b>201</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>296</a>
+                                    <b>297</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>304</a>
+                                    <b>305</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>572</a>
+                                    <b>573</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>716</a>
+                                    <b>717</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1599</a>
+                                    <b>1600</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1646</a>
+                                    <b>1647</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>3782</a>
+                                    <b>3783</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>3872</a>
+                                    <b>3873</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>5095</a>
+                                    <b>5096</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>6814</a>
+                                    <b>6815</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>9270</a>
+                                    <b>9271</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>12058</a>
+                                    <b>12059</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>53280</a>
+                                    <b>53281</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>80172</a>
+                                    <b>80173</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>91598</a>
+                                    <b>91599</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>100025</a>
+                                    <b>100026</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>varspecifiers</name>
+            <cardinality>2352966</cardinality>
+            <columnsizes>
+                <e>
+                    <k>var_id</k>
+                    <v>1257904</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>3776</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>var_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>738222</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>202491</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>59001</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>258189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>var_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>112</a>
+                                    <b>113</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>315</a>
+                                    <b>316</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>411</a>
+                                    <b>412</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>560</a>
+                                    <b>561</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>692</a>
+                                    <b>693</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>700</a>
+                                    <b>701</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>732</a>
+                                    <b>733</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>1463</a>
+                                    <b>1464</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>attributes</name>
+            <cardinality>696623</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>696623</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>315</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1575</v>
+                </e>
+                <e>
+                    <k>name_space</k>
+                    <v>210</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>484652</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>696623</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>696623</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name_space</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>696623</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>696623</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2168</a>
+                                    <b>2169</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>4460</a>
+                                    <b>4461</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>name_space</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2055</a>
+                                    <b>2056</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2557</a>
+                                    <b>2558</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>86</a>
+                                    <b>87</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>115</a>
+                                    <b>116</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>659</a>
+                                    <b>660</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1760</a>
+                                    <b>1761</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>3932</a>
+                                    <b>3933</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1365</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>name_space</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1575</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>315</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>59</a>
+                                    <b>60</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>73</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>331</a>
+                                    <b>332</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1756</a>
+                                    <b>1757</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2379</a>
+                                    <b>2380</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name_space</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6627</a>
+                                    <b>6628</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name_space</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name_space</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name_space</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>4613</a>
+                                    <b>4614</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>443372</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>9</b>
+                                    <v>36868</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>201</b>
+                                    <v>4411</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>484652</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>480346</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>4306</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>name_space</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>484652</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>attribute_args</name>
+            <cardinality>351174</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>351174</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>1416</v>
+                </e>
+                <e>
+                    <k>attribute</k>
+                    <v>269045</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>1416</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>328046</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>351174</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>attribute</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>351174</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>351174</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>351174</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>56</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>688</a>
+                                    <b>689</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>attribute</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>56</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>536</a>
+                                    <b>537</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>56</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>666</a>
+                                    <b>667</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>attribute</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>202963</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>50032</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16048</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>attribute</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>258661</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10384</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>attribute</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>202963</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>50032</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16048</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>attribute</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>202963</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>50032</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>16048</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>140</a>
+                                    <b>141</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>570</a>
+                                    <b>571</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>attribute</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>140</a>
+                                    <b>141</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>570</a>
+                                    <b>571</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>140</a>
+                                    <b>141</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>521</a>
+                                    <b>522</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>313886</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>16</b>
+                                    <v>14160</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>315302</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>12744</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>attribute</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>313886</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>16</b>
+                                    <v>14160</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>328046</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>attribute_arg_value</name>
+            <cardinality>350702</cardinality>
+            <columnsizes>
+                <e>
+                    <k>arg</k>
+                    <v>350702</v>
+                </e>
+                <e>
+                    <k>value</k>
+                    <v>32568</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>arg</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>350702</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>arg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14632</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>12272</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>14</b>
+                                    <v>2832</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>247</b>
+                                    <v>2832</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>attribute_arg_type</name>
+            <cardinality>1535</cardinality>
+            <columnsizes>
+                <e>
+                    <k>arg</k>
+                    <v>1535</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>1354</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>arg</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1535</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>arg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1264</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>90</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>attribute_arg_name</name>
+            <cardinality>6</cardinality>
+            <columnsizes>
+                <e>
+                    <k>arg</k>
+                    <v>6</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>5</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>arg</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>arg</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>typeattributes</name>
+            <cardinality>60817</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>60397</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>60817</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>59977</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>420</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>60817</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>funcattributes</name>
+            <cardinality>637684</cardinality>
+            <columnsizes>
+                <e>
+                    <k>func_id</k>
+                    <v>448880</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>637684</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>func_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>342678</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>65137</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>40120</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>func_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>637684</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>varattributes</name>
+            <cardinality>371048</cardinality>
+            <columnsizes>
+                <e>
+                    <k>var_id</k>
+                    <v>322247</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>371048</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>var_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>273482</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>48762</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>3</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>var_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>371048</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>stmtattributes</name>
+            <cardinality>1008</cardinality>
+            <columnsizes>
+                <e>
+                    <k>stmt_id</k>
+                    <v>1008</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>1008</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>stmt_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1008</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>stmt_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1008</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>unspecifiedtype</name>
+            <cardinality>10417715</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>10417715</v>
+                </e>
+                <e>
+                    <k>unspecified_type_id</k>
+                    <v>6996120</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>unspecified_type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10417715</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>unspecified_type_id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4696963</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2054184</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>147</b>
+                                    <v>244972</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>member</name>
+            <cardinality>5120282</cardinality>
+            <columnsizes>
+                <e>
+                    <k>parent</k>
+                    <v>692861</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>8746</v>
+                </e>
+                <e>
+                    <k>child</k>
+                    <v>5057871</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>parent</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>3</b>
+                                    <v>18716</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>396265</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>38727</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>52616</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>52476</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>57164</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>30</b>
+                                    <v>52581</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>251</b>
+                                    <v>24313</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>child</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>3</b>
+                                    <v>18716</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>396230</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>38692</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>52791</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>52791</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>56919</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>29</b>
+                                    <v>52371</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>253</b>
+                                    <v>24348</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1399</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>804</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>22</b>
+                                    <v>769</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>43</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>61</b>
+                                    <v>699</v>
+                                </b>
+                                <b>
+                                    <a>62</a>
+                                    <b>113</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>114</a>
+                                    <b>185</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>186</a>
+                                    <b>331</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>367</a>
+                                    <b>1282</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>1418</a>
+                                    <b>5994</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>7270</a>
+                                    <b>19474</b>
+                                    <v>139</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>child</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>804</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>874</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1154</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>16</b>
+                                    <v>734</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>33</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>58</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>58</a>
+                                    <b>93</b>
+                                    <v>699</v>
+                                </b>
+                                <b>
+                                    <a>97</a>
+                                    <b>135</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>140</a>
+                                    <b>253</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>253</a>
+                                    <b>601</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>611</a>
+                                    <b>2463</b>
+                                    <v>664</v>
+                                </b>
+                                <b>
+                                    <a>2610</a>
+                                    <b>19486</b>
+                                    <v>489</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5057871</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4996578</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>61292</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>enclosingfunction</name>
+            <cardinality>121976</cardinality>
+            <columnsizes>
+                <e>
+                    <k>child</k>
+                    <v>121976</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>69638</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>child</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>121976</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>child</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>36765</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>21633</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6117</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>45</b>
+                                    <v>5121</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>derivations</name>
+            <cardinality>397280</cardinality>
+            <columnsizes>
+                <e>
+                    <k>derivation</k>
+                    <v>397280</v>
+                </e>
+                <e>
+                    <k>sub</k>
+                    <v>376919</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>209</v>
+                </e>
+                <e>
+                    <k>super</k>
+                    <v>228236</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>37887</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>derivation</src>
+                    <trg>sub</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>397280</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>derivation</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>397280</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>derivation</src>
+                    <trg>super</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>397280</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>derivation</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>397280</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sub</src>
+                    <trg>derivation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>361876</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>7</b>
+                                    <v>15043</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sub</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>361876</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>7</b>
+                                    <v>15043</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sub</src>
+                    <trg>super</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>361876</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>7</b>
+                                    <v>15043</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sub</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>361876</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>7</b>
+                                    <v>15043</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>derivation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>78</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>430</a>
+                                    <b>431</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>10774</a>
+                                    <b>10775</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>sub</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>78</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>430</a>
+                                    <b>431</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>10774</a>
+                                    <b>10775</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>super</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>23</a>
+                                    <b>24</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>36</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>261</a>
+                                    <b>262</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>6169</a>
+                                    <b>6170</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>67</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1005</a>
+                                    <b>1006</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>super</src>
+                    <trg>derivation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>220960</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1076</b>
+                                    <v>7276</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>super</src>
+                    <trg>sub</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>220960</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1076</b>
+                                    <v>7276</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>super</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>227781</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>454</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>super</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>224668</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>108</b>
+                                    <v>3568</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>derivation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28197</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>3043</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>16</b>
+                                    <v>2973</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>133</b>
+                                    <v>2973</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>656</b>
+                                    <v>699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>sub</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28197</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>3043</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>16</b>
+                                    <v>2973</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>133</b>
+                                    <v>2973</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>656</b>
+                                    <v>699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>37887</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>super</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30611</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>3218</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>55</b>
+                                    <v>2868</v>
+                                </b>
+                                <b>
+                                    <a>60</a>
+                                    <b>656</b>
+                                    <v>1189</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>derspecifiers</name>
+            <cardinality>399169</cardinality>
+            <columnsizes>
+                <e>
+                    <k>der_id</k>
+                    <v>396895</v>
+                </e>
+                <e>
+                    <k>spec_id</k>
+                    <v>139</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>der_id</src>
+                    <trg>spec_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>394621</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2273</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>spec_id</src>
+                    <trg>der_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>93</a>
+                                    <b>94</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>1132</a>
+                                    <b>1133</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>10120</a>
+                                    <b>10121</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>direct_base_offsets</name>
+            <cardinality>368208</cardinality>
+            <columnsizes>
+                <e>
+                    <k>der_id</k>
+                    <v>368208</v>
+                </e>
+                <e>
+                    <k>offset</k>
+                    <v>349</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>der_id</src>
+                    <trg>offset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>368208</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>offset</src>
+                    <trg>der_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>104</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>69</v>
+                                </b>
+                                <b>
+                                    <a>85</a>
+                                    <b>86</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>10419</a>
+                                    <b>10420</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>virtual_base_offsets</name>
+            <cardinality>6674</cardinality>
+            <columnsizes>
+                <e>
+                    <k>sub</k>
+                    <v>3684</v>
+                </e>
+                <e>
+                    <k>super</k>
+                    <v>509</v>
+                </e>
+                <e>
+                    <k>offset</k>
+                    <v>254</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>sub</src>
+                    <trg>super</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2896</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>324</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>11</b>
+                                    <v>196</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>sub</src>
+                    <trg>offset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3105</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>312</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>266</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>super</src>
+                    <trg>sub</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>81</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>92</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>13</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>15</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>23</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>60</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>194</a>
+                                    <b>195</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>super</src>
+                    <trg>offset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>289</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>81</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>10</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>offset</src>
+                    <trg>sub</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>12</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>29</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>37</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>96</a>
+                                    <b>98</b>
+                                    <v>23</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>offset</src>
+                    <trg>super</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>81</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>46</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>23</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>29</b>
+                                    <v>23</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>frienddecls</name>
+            <cardinality>710038</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>710038</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>42085</v>
+                </e>
+                <e>
+                    <k>decl_id</k>
+                    <v>69688</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>6297</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>710038</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>decl_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>710038</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>710038</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6157</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>13119</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2938</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>3183</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>17</b>
+                                    <v>3253</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>24</b>
+                                    <v>3323</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>36</b>
+                                    <v>3288</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>55</b>
+                                    <v>3218</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>103</b>
+                                    <v>3603</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>decl_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6157</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>13119</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2938</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>3183</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>17</b>
+                                    <v>3253</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>24</b>
+                                    <v>3323</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>36</b>
+                                    <v>3288</v>
+                                </b>
+                                <b>
+                                    <a>37</a>
+                                    <b>55</b>
+                                    <v>3218</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>103</b>
+                                    <v>3603</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>40651</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>13</b>
+                                    <v>1434</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>40196</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5842</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>5982</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>5387</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>32</b>
+                                    <v>5247</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>71</b>
+                                    <v>5247</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>160</b>
+                                    <v>1784</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>40196</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5842</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>5982</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>5387</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>32</b>
+                                    <v>5247</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>71</b>
+                                    <v>5247</v>
+                                </b>
+                                <b>
+                                    <a>72</a>
+                                    <b>160</b>
+                                    <v>1784</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>69023</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>664</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5912</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>20106</b>
+                                    <v>384</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6157</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1105</b>
+                                    <v>139</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>decl_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5947</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1837</b>
+                                    <v>349</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>comments</name>
+            <cardinality>9024167</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>9024167</v>
+                </e>
+                <e>
+                    <k>contents</k>
+                    <v>3546138</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>9024167</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>contents</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9024167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9024167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>contents</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3255074</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>10</b>
+                                    <v>268901</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>32841</b>
+                                    <v>22163</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>contents</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3255074</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>10</b>
+                                    <v>268901</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>32841</b>
+                                    <v>22163</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9024167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>contents</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9024167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>commentbinding</name>
+            <cardinality>3153021</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2495512</v>
+                </e>
+                <e>
+                    <k>element</k>
+                    <v>3075612</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>element</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2412911</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>97</b>
+                                    <v>82601</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2998202</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>77409</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>exprconv</name>
+            <cardinality>7003263</cardinality>
+            <columnsizes>
+                <e>
+                    <k>converted</k>
+                    <v>7003263</v>
+                </e>
+                <e>
+                    <k>conversion</k>
+                    <v>7003263</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>converted</src>
+                    <trg>conversion</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7003263</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>conversion</src>
+                    <trg>converted</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7003263</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>compgenerated</name>
+            <cardinality>8432513</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>8432513</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>synthetic_destructor_call</name>
+            <cardinality>132767</cardinality>
+            <columnsizes>
+                <e>
+                    <k>element</k>
+                    <v>103217</v>
+                </e>
+                <e>
+                    <k>i</k>
+                    <v>305</v>
+                </e>
+                <e>
+                    <k>destructor_call</k>
+                    <v>117462</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>element</src>
+                    <trg>i</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>85325</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11801</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>18</b>
+                                    <v>6089</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element</src>
+                    <trg>destructor_call</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>85325</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>11801</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>18</b>
+                                    <v>6089</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>i</src>
+                    <trg>element</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>152</a>
+                                    <b>153</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>339</a>
+                                    <b>340</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>996</a>
+                                    <b>997</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>5746</a>
+                                    <b>5747</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>i</src>
+                    <trg>destructor_call</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>151</a>
+                                    <b>152</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>338</a>
+                                    <b>339</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>995</a>
+                                    <b>996</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>4897</a>
+                                    <b>4898</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>destructor_call</src>
+                    <trg>element</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>115450</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>26</b>
+                                    <v>2011</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>destructor_call</src>
+                    <trg>i</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>117462</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>namespaces</name>
+            <cardinality>12744</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>12744</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>10384</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12744</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8968</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>namespace_inline</name>
+            <cardinality>1416</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1416</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>namespacembrs</name>
+            <cardinality>2473800</cardinality>
+            <columnsizes>
+                <e>
+                    <k>parentid</k>
+                    <v>10856</v>
+                </e>
+                <e>
+                    <k>memberid</k>
+                    <v>2473800</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>parentid</src>
+                    <trg>memberid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>30</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>47</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>52</a>
+                                    <b>143</b>
+                                    <v>944</v>
+                                </b>
+                                <b>
+                                    <a>247</a>
+                                    <b>4603</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>memberid</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2473800</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>exprparents</name>
+            <cardinality>14151887</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr_id</k>
+                    <v>14151887</v>
+                </e>
+                <e>
+                    <k>child_index</k>
+                    <v>14601</v>
+                </e>
+                <e>
+                    <k>parent_id</k>
+                    <v>9417337</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr_id</src>
+                    <trg>child_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14151887</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr_id</src>
+                    <trg>parent_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>14151887</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child_index</src>
+                    <trg>expr_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2809</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1107</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6542</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>1209</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>1189</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>53</b>
+                                    <v>1107</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>389706</b>
+                                    <v>369</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child_index</src>
+                    <trg>parent_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2809</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1107</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>266</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>6542</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>1209</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>1189</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>53</b>
+                                    <v>1107</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>389706</b>
+                                    <v>369</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent_id</src>
+                    <trg>expr_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5388560</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3692338</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>712</b>
+                                    <v>336438</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent_id</src>
+                    <trg>child_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5388560</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3692338</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>712</b>
+                                    <v>336438</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_isload</name>
+            <cardinality>4944556</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr_id</k>
+                    <v>4944556</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>conversionkinds</name>
+            <cardinality>4220603</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr_id</k>
+                    <v>4220603</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>6</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr_id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4220603</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>expr_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2139</a>
+                                    <b>2140</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>3252</a>
+                                    <b>3253</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>13430</a>
+                                    <b>13431</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>26288</a>
+                                    <b>26289</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>44458</a>
+                                    <b>44459</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>4131036</a>
+                                    <b>4131037</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>iscall</name>
+            <cardinality>3095893</cardinality>
+            <columnsizes>
+                <e>
+                    <k>caller</k>
+                    <v>3095893</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>53</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>caller</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3095893</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>caller</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1389</a>
+                                    <b>1390</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>2512</a>
+                                    <b>2513</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>168444</a>
+                                    <b>168445</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>numtemplatearguments</name>
+            <cardinality>553810</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr_id</k>
+                    <v>553810</v>
+                </e>
+                <e>
+                    <k>num</k>
+                    <v>71</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr_id</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>553810</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>expr_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>29</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>220</a>
+                                    <b>221</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>30556</a>
+                                    <b>30557</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>specialnamequalifyingelements</name>
+            <cardinality>472</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>472</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>472</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>namequalifiers</name>
+            <cardinality>1593457</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1593457</v>
+                </e>
+                <e>
+                    <k>qualifiableelement</k>
+                    <v>1593457</v>
+                </e>
+                <e>
+                    <k>qualifyingelement</k>
+                    <v>74044</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>273366</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>qualifiableelement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1593457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>qualifyingelement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1593457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1593457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>qualifiableelement</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1593457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>qualifiableelement</src>
+                    <trg>qualifyingelement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1593457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>qualifiableelement</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1593457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>qualifyingelement</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>46848</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>12322</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5802</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>11</b>
+                                    <v>5622</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>31104</b>
+                                    <v>3448</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>qualifyingelement</src>
+                    <trg>qualifiableelement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>46848</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>12322</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>5802</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>11</b>
+                                    <v>5622</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>31104</b>
+                                    <v>3448</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>qualifyingelement</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>50477</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10885</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6089</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>15</b>
+                                    <v>5604</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>7095</b>
+                                    <v>987</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>85792</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>24160</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>41621</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>12736</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>89547</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>2135</b>
+                                    <v>19508</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>qualifiableelement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>85792</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>24160</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>41621</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>12736</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>89547</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>2135</b>
+                                    <v>19508</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>qualifyingelement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>118270</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>50782</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>95942</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>152</b>
+                                    <v>8370</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>varbind</name>
+            <cardinality>6005942</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>6005942</v>
+                </e>
+                <e>
+                    <k>var</k>
+                    <v>765575</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>var</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6005942</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>var</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>125736</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>137344</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>105884</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>84883</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>61053</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>47927</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>59392</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>13</b>
+                                    <v>59043</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>28</b>
+                                    <v>58653</v>
+                                </b>
+                                <b>
+                                    <a>28</a>
+                                    <b>5137</b>
+                                    <v>25655</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>funbind</name>
+            <cardinality>3098283</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>3094672</v>
+                </e>
+                <e>
+                    <k>fun</k>
+                    <v>512404</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>fun</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3091061</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3610</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fun</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>298514</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>85810</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>36160</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>7</b>
+                                    <v>42968</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>35</b>
+                                    <v>38603</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>4943</b>
+                                    <v>10346</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_allocator</name>
+            <cardinality>54190</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>54190</v>
+                </e>
+                <e>
+                    <k>func</k>
+                    <v>104</v>
+                </e>
+                <e>
+                    <k>form</k>
+                    <v>34</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>func</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>54190</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>form</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>54190</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>func</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>585</a>
+                                    <b>586</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>963</a>
+                                    <b>964</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>func</src>
+                    <trg>form</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>104</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>form</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1549</a>
+                                    <b>1550</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>form</src>
+                    <trg>func</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_deallocator</name>
+            <cardinality>62901</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>62901</v>
+                </e>
+                <e>
+                    <k>func</k>
+                    <v>104</v>
+                </e>
+                <e>
+                    <k>form</k>
+                    <v>69</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>func</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>62901</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>form</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>62901</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>func</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>847</a>
+                                    <b>848</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>950</a>
+                                    <b>951</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>func</src>
+                    <trg>form</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>104</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>form</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>848</a>
+                                    <b>849</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>950</a>
+                                    <b>951</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>form</src>
+                    <trg>func</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_cond_two_operand</name>
+            <cardinality>484</cardinality>
+            <columnsizes>
+                <e>
+                    <k>cond</k>
+                    <v>484</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>expr_cond_guard</name>
+            <cardinality>654457</cardinality>
+            <columnsizes>
+                <e>
+                    <k>cond</k>
+                    <v>654457</v>
+                </e>
+                <e>
+                    <k>guard</k>
+                    <v>654457</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>cond</src>
+                    <trg>guard</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>654457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>guard</src>
+                    <trg>cond</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>654457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_cond_true</name>
+            <cardinality>654455</cardinality>
+            <columnsizes>
+                <e>
+                    <k>cond</k>
+                    <v>654455</v>
+                </e>
+                <e>
+                    <k>true</k>
+                    <v>654455</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>cond</src>
+                    <trg>true</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>654455</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>true</src>
+                    <trg>cond</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>654455</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_cond_false</name>
+            <cardinality>654457</cardinality>
+            <columnsizes>
+                <e>
+                    <k>cond</k>
+                    <v>654457</v>
+                </e>
+                <e>
+                    <k>false</k>
+                    <v>654457</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>cond</src>
+                    <trg>false</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>654457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>false</src>
+                    <trg>cond</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>654457</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>values</name>
+            <cardinality>10645398</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>10645398</v>
+                </e>
+                <e>
+                    <k>str</k>
+                    <v>86632</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>str</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10645398</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>str</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>58704</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>12259</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>6746</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>62</b>
+                                    <v>6512</v>
+                                </b>
+                                <b>
+                                    <a>62</a>
+                                    <b>451065</b>
+                                    <v>2410</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>valuetext</name>
+            <cardinality>4756700</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4756700</v>
+                </e>
+                <e>
+                    <k>text</k>
+                    <v>703927</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4756700</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>527530</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>102489</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>56761</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>425881</b>
+                                    <v>17147</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>valuebind</name>
+            <cardinality>11082271</cardinality>
+            <columnsizes>
+                <e>
+                    <k>val</k>
+                    <v>10645398</v>
+                </e>
+                <e>
+                    <k>expr</k>
+                    <v>11082271</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>val</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>10231303</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>7</b>
+                                    <v>414094</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>val</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11082271</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fieldoffsets</name>
+            <cardinality>1050009</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1050009</v>
+                </e>
+                <e>
+                    <k>byteoffset</k>
+                    <v>22591</v>
+                </e>
+                <e>
+                    <k>bitoffset</k>
+                    <v>318</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>byteoffset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1050009</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>bitoffset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1050009</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>byteoffset</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12966</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1710</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1789</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>1909</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>35</b>
+                                    <v>1710</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>205</b>
+                                    <v>1710</v>
+                                </b>
+                                <b>
+                                    <a>244</a>
+                                    <b>5638</b>
+                                    <v>795</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>byteoffset</src>
+                    <trg>bitoffset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21915</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>9</b>
+                                    <v>676</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bitoffset</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>30</a>
+                                    <b>31</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>34</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>55</a>
+                                    <b>56</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>26131</a>
+                                    <b>26132</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bitoffset</src>
+                    <trg>byteoffset</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>568</a>
+                                    <b>569</b>
+                                    <v>39</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>bitfield</name>
+            <cardinality>21007</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>21007</v>
+                </e>
+                <e>
+                    <k>bits</k>
+                    <v>2625</v>
+                </e>
+                <e>
+                    <k>declared_bits</k>
+                    <v>2625</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>bits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21007</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>declared_bits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21007</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bits</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>735</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>115</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>bits</src>
+                    <trg>declared_bits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>declared_bits</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>735</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>630</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>210</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>115</b>
+                                    <v>210</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>declared_bits</src>
+                    <trg>bits</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2625</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>initialisers</name>
+            <cardinality>1736804</cardinality>
+            <columnsizes>
+                <e>
+                    <k>init</k>
+                    <v>1736804</v>
+                </e>
+                <e>
+                    <k>var</k>
+                    <v>719782</v>
+                </e>
+                <e>
+                    <k>expr</k>
+                    <v>1736804</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>391526</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>init</src>
+                    <trg>var</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1736804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>init</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1736804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>init</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1736804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>var</src>
+                    <trg>init</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>631170</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>16</b>
+                                    <v>31717</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>25</b>
+                                    <v>56851</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>112</b>
+                                    <v>44</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>var</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>631170</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>16</b>
+                                    <v>31717</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>25</b>
+                                    <v>56851</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>112</b>
+                                    <v>44</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>var</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>719700</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>81</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>init</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1736804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>var</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1736804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1736804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>init</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>318848</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>23904</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>15</b>
+                                    <v>30865</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>111462</b>
+                                    <v>17907</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>var</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>341914</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>35670</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>12741</b>
+                                    <v>13941</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>318848</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>23904</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>15</b>
+                                    <v>30865</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>111462</b>
+                                    <v>17907</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_ancestor</name>
+            <cardinality>121360</cardinality>
+            <columnsizes>
+                <e>
+                    <k>exp</k>
+                    <v>121360</v>
+                </e>
+                <e>
+                    <k>ancestor</k>
+                    <v>84661</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>exp</src>
+                    <trg>ancestor</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>121360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>ancestor</src>
+                    <trg>exp</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61219</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>16741</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>6466</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>18</b>
+                                    <v>233</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>exprs</name>
+            <cardinality>18298854</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>18298854</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>8670</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>7747846</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18298854</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18298854</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>6</b>
+                                    <v>632</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>632</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>28</b>
+                                    <v>541</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>45</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>88</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>89</a>
+                                    <b>122</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>152</a>
+                                    <b>234</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>241</a>
+                                    <b>441</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>504</a>
+                                    <b>778</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>802</a>
+                                    <b>1049</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>1117</a>
+                                    <b>2286</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>2424</a>
+                                    <b>9743</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>22722</a>
+                                    <b>53144</b>
+                                    <v>361</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>3</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>541</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>13</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>24</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>37</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>101</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>175</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>180</a>
+                                    <b>279</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>281</a>
+                                    <b>499</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>565</a>
+                                    <b>774</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>813</a>
+                                    <b>1643</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>1728</a>
+                                    <b>13946</b>
+                                    <v>722</v>
+                                </b>
+                                <b>
+                                    <a>15037</a>
+                                    <b>33170</b>
+                                    <v>180</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5161708</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1378731</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>662723</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>14777</b>
+                                    <v>544682</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5999730</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1427591</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>26</b>
+                                    <v>320523</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>expr_types</name>
+            <cardinality>18356354</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>18298854</v>
+                </e>
+                <e>
+                    <k>typeid</k>
+                    <v>806338</v>
+                </e>
+                <e>
+                    <k>value_category</k>
+                    <v>53</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>typeid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18241425</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>57428</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>value_category</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18298854</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>typeid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>278288</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>160556</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>69787</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>57051</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>62027</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>67236</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>35</b>
+                                    <v>61758</v>
+                                </b>
+                                <b>
+                                    <a>35</a>
+                                    <b>78725</b>
+                                    <v>49632</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>typeid</src>
+                    <trg>value_category</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>695684</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>100271</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>10382</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value_category</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>11948</a>
+                                    <b>11949</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>253514</a>
+                                    <b>253515</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>753215</a>
+                                    <b>753216</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value_category</src>
+                    <trg>typeid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1415</a>
+                                    <b>1416</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>11760</a>
+                                    <b>11761</b>
+                                    <v>17</v>
+                                </b>
+                                <b>
+                                    <a>38451</a>
+                                    <b>38452</b>
+                                    <v>17</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>new_allocated_type</name>
+            <cardinality>55240</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>55240</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>27952</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>55240</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9095</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>15987</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>2134</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>28</b>
+                                    <v>734</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>new_array_allocated_type</name>
+            <cardinality>5113</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>5113</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>2200</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5113</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>31</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1948</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>170</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>50</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>aggregate_field_init</name>
+            <cardinality>4005579</cardinality>
+            <columnsizes>
+                <e>
+                    <k>aggregate</k>
+                    <v>847953</v>
+                </e>
+                <e>
+                    <k>initializer</k>
+                    <v>4005406</v>
+                </e>
+                <e>
+                    <k>field</k>
+                    <v>2156</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>aggregate</src>
+                    <trg>initializer</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6503</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>500733</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11095</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>88743</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>49719</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>190968</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>42</b>
+                                    <v>192</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>aggregate</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6502</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>500702</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>11095</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>88750</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>12</b>
+                                    <v>49743</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>190968</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>42</b>
+                                    <v>193</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>initializer</src>
+                    <trg>aggregate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4005406</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>initializer</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4005233</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>173</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>aggregate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>782</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>202</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>158</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>21</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>44</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>106</b>
+                                    <v>171</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>383</b>
+                                    <v>167</v>
+                                </b>
+                                <b>
+                                    <a>394</a>
+                                    <b>190920</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>288611</a>
+                                    <b>288612</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>initializer</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>782</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>202</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>158</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>12</b>
+                                    <v>184</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>21</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>21</a>
+                                    <b>44</b>
+                                    <v>164</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>106</b>
+                                    <v>171</v>
+                                </b>
+                                <b>
+                                    <a>108</a>
+                                    <b>383</b>
+                                    <v>167</v>
+                                </b>
+                                <b>
+                                    <a>394</a>
+                                    <b>190920</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>288611</a>
+                                    <b>288612</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>aggregate_array_init</name>
+            <cardinality>730401</cardinality>
+            <columnsizes>
+                <e>
+                    <k>aggregate</k>
+                    <v>65615</v>
+                </e>
+                <e>
+                    <k>initializer</k>
+                    <v>730401</v>
+                </e>
+                <e>
+                    <k>element_index</k>
+                    <v>17485</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>aggregate</src>
+                    <trg>initializer</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7521</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7791</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>17335</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8012</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>5810</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>5006</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>5381</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>22</b>
+                                    <v>4985</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>17486</b>
+                                    <v>3774</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>aggregate</src>
+                    <trg>element_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>7521</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7791</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>17335</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8012</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>5810</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>5006</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>5381</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>22</b>
+                                    <v>4985</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>17486</b>
+                                    <v>3774</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>initializer</src>
+                    <trg>aggregate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>730401</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>initializer</src>
+                    <trg>element_index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>730401</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element_index</src>
+                    <trg>aggregate</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6580</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2653</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1308</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1488</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1059</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>1388</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>27</b>
+                                    <v>1379</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>198</b>
+                                    <v>1316</v>
+                                </b>
+                                <b>
+                                    <a>202</a>
+                                    <b>65616</b>
+                                    <v>314</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>element_index</src>
+                    <trg>initializer</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6580</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2653</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1308</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1488</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>1059</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>1388</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>27</b>
+                                    <v>1379</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>198</b>
+                                    <v>1316</v>
+                                </b>
+                                <b>
+                                    <a>202</a>
+                                    <b>65616</b>
+                                    <v>314</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>condition_decl_bind</name>
+            <cardinality>38495</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>38495</v>
+                </e>
+                <e>
+                    <k>decl</k>
+                    <v>38495</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38495</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>38495</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>typeid_bind</name>
+            <cardinality>36173</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>36173</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>16267</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>36173</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>15847</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>328</b>
+                                    <v>419</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>uuidof_bind</name>
+            <cardinality>20051</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>20051</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>19856</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20051</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>19692</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>163</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>sizeof_bind</name>
+            <cardinality>191840</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>191840</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>8193</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>191840</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2697</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2330</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>776</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>750</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>212</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>9</b>
+                                    <v>723</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>133</b>
+                                    <v>649</v>
+                                </b>
+                                <b>
+                                    <a>164</a>
+                                    <b>18023</b>
+                                    <v>53</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>code_block</name>
+            <cardinality>15</cardinality>
+            <columnsizes>
+                <e>
+                    <k>block</k>
+                    <v>15</v>
+                </e>
+                <e>
+                    <k>routine</k>
+                    <v>15</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>block</src>
+                    <trg>routine</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>15</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>routine</src>
+                    <trg>block</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>15</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>lambdas</name>
+            <cardinality>21712</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>21712</v>
+                </e>
+                <e>
+                    <k>default_capture</k>
+                    <v>472</v>
+                </e>
+                <e>
+                    <k>has_explicit_return_type</k>
+                    <v>472</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>default_capture</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21712</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>has_explicit_return_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21712</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>default_capture</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>46</a>
+                                    <b>47</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>default_capture</src>
+                    <trg>has_explicit_return_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>has_explicit_return_type</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>46</a>
+                                    <b>47</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>has_explicit_return_type</src>
+                    <trg>default_capture</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>lambda_capture</name>
+            <cardinality>28320</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>28320</v>
+                </e>
+                <e>
+                    <k>lambda</k>
+                    <v>20768</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>944</v>
+                </e>
+                <e>
+                    <k>field</k>
+                    <v>28320</v>
+                </e>
+                <e>
+                    <k>captured_by_reference</k>
+                    <v>472</v>
+                </e>
+                <e>
+                    <k>is_implicit</k>
+                    <v>472</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>2832</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>lambda</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>captured_by_reference</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>is_implicit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>lambda</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13216</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7552</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>lambda</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13216</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7552</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>lambda</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13216</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7552</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>lambda</src>
+                    <trg>captured_by_reference</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20768</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>lambda</src>
+                    <trg>is_implicit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20768</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>lambda</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>13216</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>7552</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>lambda</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>captured_by_reference</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>is_implicit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>lambda</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>captured_by_reference</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>is_implicit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>field</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>28320</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>captured_by_reference</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>60</a>
+                                    <b>61</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>captured_by_reference</src>
+                    <trg>lambda</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>captured_by_reference</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>captured_by_reference</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>60</a>
+                                    <b>61</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>captured_by_reference</src>
+                    <trg>is_implicit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>captured_by_reference</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_implicit</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>60</a>
+                                    <b>61</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_implicit</src>
+                    <trg>lambda</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>44</a>
+                                    <b>45</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_implicit</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_implicit</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>60</a>
+                                    <b>61</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_implicit</src>
+                    <trg>captured_by_reference</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_implicit</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>472</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>lambda</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2832</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>field</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>1888</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>944</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>captured_by_reference</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2832</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>is_implicit</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2832</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>fold</name>
+            <cardinality>4</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>4</v>
+                </e>
+                <e>
+                    <k>operator</k>
+                    <v>4</v>
+                </e>
+                <e>
+                    <k>is_left_fold</k>
+                    <v>2</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>expr</src>
+                    <trg>operator</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>is_left_fold</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>operator</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>operator</src>
+                    <trg>is_left_fold</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_left_fold</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>is_left_fold</src>
+                    <trg>operator</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>stmts</name>
+            <cardinality>4689495</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4689495</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>1995</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>2293751</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4689495</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4689495</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>47</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>76</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>84</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>102</a>
+                                    <b>103</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>155</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>242</a>
+                                    <b>243</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>284</a>
+                                    <b>285</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>383</a>
+                                    <b>384</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>418</a>
+                                    <b>419</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>501</a>
+                                    <b>502</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1324</a>
+                                    <b>1325</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2629</a>
+                                    <b>2630</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>4606</a>
+                                    <b>4607</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>8935</a>
+                                    <b>8936</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>11547</a>
+                                    <b>11548</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>13275</a>
+                                    <b>13276</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>56</a>
+                                    <b>57</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>75</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>88</a>
+                                    <b>89</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>101</a>
+                                    <b>102</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>209</a>
+                                    <b>210</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>252</a>
+                                    <b>253</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>368</a>
+                                    <b>369</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>641</a>
+                                    <b>642</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1742</a>
+                                    <b>1743</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2183</a>
+                                    <b>2184</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>4210</a>
+                                    <b>4211</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6065</a>
+                                    <b>6066</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6529</a>
+                                    <b>6530</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1897016</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>177201</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>12</b>
+                                    <v>176466</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>684</b>
+                                    <v>43066</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2234613</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>8</b>
+                                    <v>59137</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>type_vla</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>decl</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>variable_vla</name>
+            <cardinality>21</cardinality>
+            <columnsizes>
+                <e>
+                    <k>var</k>
+                    <v>21</v>
+                </e>
+                <e>
+                    <k>decl</k>
+                    <v>21</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>var</src>
+                    <trg>decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl</src>
+                    <trg>var</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>if_then</name>
+            <cardinality>723123</cardinality>
+            <columnsizes>
+                <e>
+                    <k>if_stmt</k>
+                    <v>723123</v>
+                </e>
+                <e>
+                    <k>then_id</k>
+                    <v>723123</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>if_stmt</src>
+                    <trg>then_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>723123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>then_id</src>
+                    <trg>if_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>723123</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>if_else</name>
+            <cardinality>183959</cardinality>
+            <columnsizes>
+                <e>
+                    <k>if_stmt</k>
+                    <v>183959</v>
+                </e>
+                <e>
+                    <k>else_id</k>
+                    <v>183959</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>if_stmt</src>
+                    <trg>else_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183959</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>else_id</src>
+                    <trg>if_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>183959</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>constexpr_if_then</name>
+            <cardinality>52624</cardinality>
+            <columnsizes>
+                <e>
+                    <k>constexpr_if_stmt</k>
+                    <v>52624</v>
+                </e>
+                <e>
+                    <k>then_id</k>
+                    <v>52624</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>constexpr_if_stmt</src>
+                    <trg>then_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52624</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>then_id</src>
+                    <trg>constexpr_if_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>52624</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>constexpr_if_else</name>
+            <cardinality>30986</cardinality>
+            <columnsizes>
+                <e>
+                    <k>constexpr_if_stmt</k>
+                    <v>30986</v>
+                </e>
+                <e>
+                    <k>else_id</k>
+                    <v>30986</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>constexpr_if_stmt</src>
+                    <trg>else_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30986</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>else_id</src>
+                    <trg>constexpr_if_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30986</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>while_body</name>
+            <cardinality>30265</cardinality>
+            <columnsizes>
+                <e>
+                    <k>while_stmt</k>
+                    <v>30265</v>
+                </e>
+                <e>
+                    <k>body_id</k>
+                    <v>30265</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>while_stmt</src>
+                    <trg>body_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30265</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>body_id</src>
+                    <trg>while_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>30265</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>do_body</name>
+            <cardinality>148593</cardinality>
+            <columnsizes>
+                <e>
+                    <k>do_stmt</k>
+                    <v>148593</v>
+                </e>
+                <e>
+                    <k>body_id</k>
+                    <v>148593</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>do_stmt</src>
+                    <trg>body_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>148593</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>body_id</src>
+                    <trg>do_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>148593</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>switch_case</name>
+            <cardinality>190914</cardinality>
+            <columnsizes>
+                <e>
+                    <k>switch_stmt</k>
+                    <v>10275</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>4418</v>
+                </e>
+                <e>
+                    <k>case_id</k>
+                    <v>190914</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>switch_stmt</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2263</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1652</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1005</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>754</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>718</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>970</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>323</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>14</b>
+                                    <v>862</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>826</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>247</b>
+                                    <v>844</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>switch_stmt</src>
+                    <trg>case_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2263</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1652</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1005</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>754</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>718</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>970</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>323</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>14</b>
+                                    <v>862</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>31</b>
+                                    <v>826</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>247</b>
+                                    <v>844</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>switch_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1167</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>538</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>33</b>
+                                    <v>1904</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>62</b>
+                                    <v>377</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>296</b>
+                                    <v>341</v>
+                                </b>
+                                <b>
+                                    <a>351</a>
+                                    <b>573</b>
+                                    <v>89</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>case_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>1167</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>19</b>
+                                    <v>538</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
+                                    <b>33</b>
+                                    <v>1904</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>62</b>
+                                    <v>377</v>
+                                </b>
+                                <b>
+                                    <a>66</a>
+                                    <b>296</b>
+                                    <v>341</v>
+                                </b>
+                                <b>
+                                    <a>351</a>
+                                    <b>573</b>
+                                    <v>89</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>case_id</src>
+                    <trg>switch_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>190914</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>case_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>190914</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>switch_body</name>
+            <cardinality>20900</cardinality>
+            <columnsizes>
+                <e>
+                    <k>switch_stmt</k>
+                    <v>20900</v>
+                </e>
+                <e>
+                    <k>body_id</k>
+                    <v>20900</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>switch_stmt</src>
+                    <trg>body_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20900</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>body_id</src>
+                    <trg>switch_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20900</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>for_initialization</name>
+            <cardinality>53198</cardinality>
+            <columnsizes>
+                <e>
+                    <k>for_stmt</k>
+                    <v>53198</v>
+                </e>
+                <e>
+                    <k>init_id</k>
+                    <v>53198</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>for_stmt</src>
+                    <trg>init_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>init_id</src>
+                    <trg>for_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>for_condition</name>
+            <cardinality>55454</cardinality>
+            <columnsizes>
+                <e>
+                    <k>for_stmt</k>
+                    <v>55454</v>
+                </e>
+                <e>
+                    <k>condition_id</k>
+                    <v>55454</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>for_stmt</src>
+                    <trg>condition_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>55454</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>condition_id</src>
+                    <trg>for_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>55454</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>for_update</name>
+            <cardinality>53301</cardinality>
+            <columnsizes>
+                <e>
+                    <k>for_stmt</k>
+                    <v>53301</v>
+                </e>
+                <e>
+                    <k>update_id</k>
+                    <v>53301</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>for_stmt</src>
+                    <trg>update_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53301</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>update_id</src>
+                    <trg>for_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53301</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>for_body</name>
+            <cardinality>61319</cardinality>
+            <columnsizes>
+                <e>
+                    <k>for_stmt</k>
+                    <v>61319</v>
+                </e>
+                <e>
+                    <k>body_id</k>
+                    <v>61319</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>for_stmt</src>
+                    <trg>body_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61319</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>body_id</src>
+                    <trg>for_stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61319</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>stmtparents</name>
+            <cardinality>4064694</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4064694</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>12245</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>1724432</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4064694</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4064694</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4022</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1002</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>220</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1557</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1021</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>794</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>29</b>
+                                    <v>1078</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>38</b>
+                                    <v>920</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>77</b>
+                                    <v>926</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>196938</b>
+                                    <v>699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4022</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1002</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>220</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1557</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1021</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>794</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>29</b>
+                                    <v>1078</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>38</b>
+                                    <v>920</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>77</b>
+                                    <v>926</v>
+                                </b>
+                                <b>
+                                    <a>77</a>
+                                    <b>196938</b>
+                                    <v>699</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>989567</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>374640</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>106047</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>111564</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>17</b>
+                                    <v>130216</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>1943</b>
+                                    <v>12396</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>989567</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>374640</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>106047</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>111564</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>17</b>
+                                    <v>130216</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>1943</b>
+                                    <v>12396</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>ishandler</name>
+            <cardinality>59279</cardinality>
+            <columnsizes>
+                <e>
+                    <k>block</k>
+                    <v>59279</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>stmt_decl_bind</name>
+            <cardinality>585681</cardinality>
+            <columnsizes>
+                <e>
+                    <k>stmt</k>
+                    <v>545527</v>
+                </e>
+                <e>
+                    <k>num</k>
+                    <v>75</v>
+                </e>
+                <e>
+                    <k>decl</k>
+                    <v>585576</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>stmt</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>524646</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>19</b>
+                                    <v>20881</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>stmt</src>
+                    <trg>decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>524646</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>19</b>
+                                    <v>20881</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>89</a>
+                                    <b>90</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>218</a>
+                                    <b>219</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>390</a>
+                                    <b>391</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>1086</a>
+                                    <b>1087</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>2570</a>
+                                    <b>2571</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4968</a>
+                                    <b>4969</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>129788</a>
+                                    <b>129789</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>decl</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>89</a>
+                                    <b>90</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>218</a>
+                                    <b>219</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>390</a>
+                                    <b>391</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>1086</a>
+                                    <b>1087</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>2570</a>
+                                    <b>2571</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4968</a>
+                                    <b>4969</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>129763</a>
+                                    <b>129764</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl</src>
+                    <trg>stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>585538</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>37</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>585576</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>stmt_decl_entry_bind</name>
+            <cardinality>528084</cardinality>
+            <columnsizes>
+                <e>
+                    <k>stmt</k>
+                    <v>488233</v>
+                </e>
+                <e>
+                    <k>num</k>
+                    <v>75</v>
+                </e>
+                <e>
+                    <k>decl_entry</k>
+                    <v>528025</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>stmt</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>467616</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>19</b>
+                                    <v>20616</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>stmt</src>
+                    <trg>decl_entry</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>467616</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>19</b>
+                                    <v>20616</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>89</a>
+                                    <b>90</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>218</a>
+                                    <b>219</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>390</a>
+                                    <b>391</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>1086</a>
+                                    <b>1087</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>2561</a>
+                                    <b>2562</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4905</a>
+                                    <b>4906</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>116157</a>
+                                    <b>116158</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>num</src>
+                    <trg>decl_entry</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>89</a>
+                                    <b>90</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>128</a>
+                                    <b>129</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>218</a>
+                                    <b>219</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>390</a>
+                                    <b>391</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>1086</a>
+                                    <b>1087</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>2561</a>
+                                    <b>2562</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>4905</a>
+                                    <b>4906</b>
+                                    <v>4</v>
+                                </b>
+                                <b>
+                                    <a>116143</a>
+                                    <b>116144</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_entry</src>
+                    <trg>stmt</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>528004</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>6</b>
+                                    <v>21</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_entry</src>
+                    <trg>num</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>528025</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>blockscope</name>
+            <cardinality>1442932</cardinality>
+            <columnsizes>
+                <e>
+                    <k>block</k>
+                    <v>1442932</v>
+                </e>
+                <e>
+                    <k>enclosing</k>
+                    <v>1326345</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>block</src>
+                    <trg>enclosing</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1442932</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>enclosing</src>
+                    <trg>block</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1260264</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>13</b>
+                                    <v>66081</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>jumpinfo</name>
+            <cardinality>253977</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>253977</v>
+                </e>
+                <e>
+                    <k>str</k>
+                    <v>21151</v>
+                </e>
+                <e>
+                    <k>target</k>
+                    <v>53042</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>str</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>253977</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>target</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>253977</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>str</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9874</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>4246</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1565</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>1340</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>1699</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>22</b>
+                                    <v>1620</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>13723</b>
+                                    <v>804</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>str</src>
+                    <trg>target</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>16716</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2631</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>10</b>
+                                    <v>1687</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>3326</b>
+                                    <v>115</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>target</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>26426</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12896</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>5342</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>4690</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>2124</b>
+                                    <v>3661</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>target</src>
+                    <trg>str</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>53042</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>preprocdirects</name>
+            <cardinality>4447274</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4447274</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>1050</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>4444753</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4447274</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4447274</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>121</a>
+                                    <b>122</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>693</a>
+                                    <b>694</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>794</a>
+                                    <b>795</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>917</a>
+                                    <b>918</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1697</a>
+                                    <b>1698</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1785</a>
+                                    <b>1786</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2983</a>
+                                    <b>2984</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>3799</a>
+                                    <b>3800</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6290</a>
+                                    <b>6291</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>23260</a>
+                                    <b>23261</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>121</a>
+                                    <b>122</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>693</a>
+                                    <b>694</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>794</a>
+                                    <b>795</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>917</a>
+                                    <b>918</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1697</a>
+                                    <b>1698</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>1785</a>
+                                    <b>1786</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>2983</a>
+                                    <b>2984</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>3799</a>
+                                    <b>3800</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>6290</a>
+                                    <b>6291</b>
+                                    <v>105</v>
+                                </b>
+                                <b>
+                                    <a>23236</a>
+                                    <b>23237</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4444648</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4444753</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>preprocpair</name>
+            <cardinality>1443876</cardinality>
+            <columnsizes>
+                <e>
+                    <k>begin</k>
+                    <v>1206927</v>
+                </e>
+                <e>
+                    <k>elseelifend</k>
+                    <v>1443876</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>begin</src>
+                    <trg>elseelifend</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>986027</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>210516</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>11</b>
+                                    <v>10384</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elseelifend</src>
+                    <trg>begin</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1443876</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>preproctrue</name>
+            <cardinality>784479</cardinality>
+            <columnsizes>
+                <e>
+                    <k>branch</k>
+                    <v>784479</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>preprocfalse</name>
+            <cardinality>325686</cardinality>
+            <columnsizes>
+                <e>
+                    <k>branch</k>
+                    <v>325686</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
+        <relation>
+            <name>preproctext</name>
+            <cardinality>3585423</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>3585423</v>
+                </e>
+                <e>
+                    <k>head</k>
+                    <v>2599941</v>
+                </e>
+                <e>
+                    <k>body</k>
+                    <v>1520449</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>head</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3585423</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>body</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3585423</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>head</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2452360</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>740</b>
+                                    <v>147580</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>head</src>
+                    <trg>body</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2537548</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>62393</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>body</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1376334</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>114073</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>11582</b>
+                                    <v>30041</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>body</src>
+                    <trg>head</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1379380</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>7</b>
+                                    <v>114388</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>2959</b>
+                                    <v>26680</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>includes</name>
+            <cardinality>316718</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>316718</v>
+                </e>
+                <e>
+                    <k>included</k>
+                    <v>118474</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>included</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>316718</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>included</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61833</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>22184</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>12744</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>10384</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14</b>
+                                    <v>8968</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>47</b>
+                                    <v>2360</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>link_targets</name>
+            <cardinality>1471</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1471</v>
+                </e>
+                <e>
+                    <k>binary</k>
+                    <v>1471</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>binary</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1471</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>binary</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1471</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>link_parent</name>
+            <cardinality>40018704</cardinality>
+            <columnsizes>
+                <e>
+                    <k>element</k>
+                    <v>5094359</v>
+                </e>
+                <e>
+                    <k>link_target</k>
+                    <v>349</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>element</src>
+                    <trg>link_target</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>694015</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>9</b>
+                                    <v>43135</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>4357208</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>link_target</src>
+                    <trg>element</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>124724</a>
+                                    <b>124725</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>124828</a>
+                                    <b>124829</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>124926</a>
+                                    <b>124927</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>124964</a>
+                                    <b>124965</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>124978</a>
+                                    <b>124979</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>124980</a>
+                                    <b>124981</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>126863</a>
+                                    <b>126864</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>132946</a>
+                                    <b>132947</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>134697</a>
+                                    <b>134698</b>
+                                    <v>34</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlEncoding</name>
+            <cardinality>39724</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>39724</v>
+                </e>
+                <e>
+                    <k>encoding</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>encoding</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>39724</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>encoding</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>39724</a>
+                                    <b>39725</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlDTDs</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>root</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>publicId</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>systemId</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>root</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>publicId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>systemId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>root</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>root</src>
+                    <trg>publicId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>root</src>
+                    <trg>systemId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>root</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>publicId</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>publicId</src>
+                    <trg>root</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>publicId</src>
+                    <trg>systemId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>publicId</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>systemId</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>systemId</src>
+                    <trg>root</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>systemId</src>
+                    <trg>publicId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>systemId</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>root</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>publicId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>systemId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlElements</name>
+            <cardinality>1270313</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1270313</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>4655</v>
+                </e>
+                <e>
+                    <k>parentid</k>
+                    <v>578021</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>35122</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>39721</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1270313</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1270313</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1270313</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1270313</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>420</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>156</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3832</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>310317</b>
+                                    <v>247</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>456</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>150</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3829</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>161565</b>
+                                    <v>220</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4358</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>35123</b>
+                                    <v>297</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>486</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>133</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3831</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>14503</b>
+                                    <v>205</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>371969</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>62095</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>104113</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>35123</b>
+                                    <v>39844</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>500482</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>17866</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>49117</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>45</b>
+                                    <v>10556</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>371969</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>62095</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>104113</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>35123</b>
+                                    <v>39844</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>578021</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>606</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>17851</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>6533</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>859</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4471</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>2719</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>578022</b>
+                                    <v>2083</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18457</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>6533</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>6178</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>2624</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>4397</b>
+                                    <v>1330</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>606</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>17851</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>6533</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>859</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4471</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>2719</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>578022</b>
+                                    <v>2083</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>606</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>17851</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>6533</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>859</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4471</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>2719</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>39722</b>
+                                    <v>2083</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20457</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3115</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>3026</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>3588</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>2220</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>3099</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>19</b>
+                                    <v>3087</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>114506</b>
+                                    <v>1129</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20459</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3458</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>2569</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>2172</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>6158</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>3501</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>46</b>
+                                    <v>1404</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>20457</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>3870</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>2152</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>2876</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>2720</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>4132</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>3096</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>31079</b>
+                                    <v>418</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>25894</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5301</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>3787</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>3268</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>35123</b>
+                                    <v>1471</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlAttrs</name>
+            <cardinality>1202020</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1202020</v>
+                </e>
+                <e>
+                    <k>elementid</k>
+                    <v>760198</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>3649</v>
+                </e>
+                <e>
+                    <k>value</k>
+                    <v>121803</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>2000</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>39448</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1202020</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1202020</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1202020</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1202020</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1202020</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elementid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>425697</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>249659</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>66474</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>2001</b>
+                                    <v>18368</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elementid</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>425778</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>249579</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>66475</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>2001</b>
+                                    <v>18366</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elementid</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>466237</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>266291</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>46</b>
+                                    <v>27670</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elementid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>425697</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>249659</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>66474</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>2001</b>
+                                    <v>18368</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elementid</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>760198</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3467</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>262475</b>
+                                    <v>182</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3467</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>262475</b>
+                                    <v>182</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3501</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>54146</b>
+                                    <v>148</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3531</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>11</b>
+                                    <v>118</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3491</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>21768</b>
+                                    <v>158</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>72032</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>42366</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>199269</b>
+                                    <v>7405</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>72036</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>42374</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>199269</b>
+                                    <v>7393</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>116722</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>2041</b>
+                                    <v>5081</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>117957</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>2001</b>
+                                    <v>3846</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>86306</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>28570</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4175</b>
+                                    <v>6927</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1955</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>760199</b>
+                                    <v>45</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1955</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>760199</b>
+                                    <v>45</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1955</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>189</b>
+                                    <v>45</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1955</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>116643</b>
+                                    <v>45</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1955</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>39449</b>
+                                    <v>45</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22884</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>2565</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>2294</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>3299</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>9</b>
+                                    <v>3272</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>16</b>
+                                    <v>3143</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>129952</b>
+                                    <v>1991</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>elementid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>23890</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>2131</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1971</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>4096</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>3519</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>16</b>
+                                    <v>3137</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>106600</b>
+                                    <v>704</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22946</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2338</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>2726</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>2824</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>2994</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>3876</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>2002</b>
+                                    <v>1744</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>22916</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>2772</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>2112</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3510</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>1993</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>11</b>
+                                    <v>3365</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>50357</b>
+                                    <v>2780</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26133</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>9699</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>3511</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>2001</b>
+                                    <v>105</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlNs</name>
+            <cardinality>71201</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>4185</v>
+                </e>
+                <e>
+                    <k>prefixName</k>
+                    <v>958</v>
+                </e>
+                <e>
+                    <k>URI</k>
+                    <v>4185</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>39544</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>prefixName</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2602</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1553</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>872</b>
+                                    <v>30</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>URI</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4185</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>6</b>
+                                    <v>274</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>3825</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>24905</b>
+                                    <v>86</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>prefixName</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>915</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4054</b>
+                                    <v>43</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>prefixName</src>
+                    <trg>URI</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>915</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4054</b>
+                                    <v>43</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>prefixName</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>828</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>73</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>24903</b>
+                                    <v>57</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>URI</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4185</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>URI</src>
+                    <trg>prefixName</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2602</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1553</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>872</b>
+                                    <v>30</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>URI</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>6</b>
+                                    <v>274</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>3825</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>24905</b>
+                                    <v>86</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11655</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>26146</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>1743</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>prefixName</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11653</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>25982</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>31</b>
+                                    <v>1909</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>URI</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11655</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>26146</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>1743</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlHasNs</name>
+            <cardinality>1139730</cardinality>
+            <columnsizes>
+                <e>
+                    <k>elementId</k>
+                    <v>1139730</v>
+                </e>
+                <e>
+                    <k>nsId</k>
+                    <v>4136</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>39537</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>elementId</src>
+                    <trg>nsId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1139730</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>elementId</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1139730</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>nsId</src>
+                    <trg>elementId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>5</b>
+                                    <v>234</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3824</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>643289</b>
+                                    <v>78</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>nsId</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>5</b>
+                                    <v>257</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>3823</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>24759</b>
+                                    <v>56</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>elementId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3669</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20429</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>2536</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>3473</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>2258</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>11</b>
+                                    <v>3036</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>18</b>
+                                    <v>2966</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>147552</b>
+                                    <v>1170</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>nsId</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>18261</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>21032</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>244</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlComments</name>
+            <cardinality>26812</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>26812</v>
+                </e>
+                <e>
+                    <k>text</k>
+                    <v>22933</v>
+                </e>
+                <e>
+                    <k>parentid</k>
+                    <v>26546</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>26368</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26812</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26812</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26812</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21517</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>62</b>
+                                    <v>1416</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21519</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>62</b>
+                                    <v>1414</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>21522</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>62</b>
+                                    <v>1411</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26379</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26379</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>167</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26546</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26161</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>207</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26165</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>17</b>
+                                    <v>203</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26223</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>10</b>
+                                    <v>145</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmlChars</name>
+            <cardinality>439958</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>439958</v>
+                </e>
+                <e>
+                    <k>text</k>
+                    <v>100518</v>
+                </e>
+                <e>
+                    <k>parentid</k>
+                    <v>433851</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>4</v>
+                </e>
+                <e>
+                    <k>isCDATA</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>fileid</k>
+                    <v>26494</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>439958</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>439958</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>439958</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>isCDATA</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>439958</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>439958</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>60389</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>3811</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>29257</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23171</b>
+                                    <v>7061</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>60389</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>3811</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>29257</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>23171</b>
+                                    <v>7061</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>100517</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>isCDATA</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>100518</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>text</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61284</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>4205</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>28328</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>351</b>
+                                    <v>6701</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>429716</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>4135</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>429716</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>4135</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>429716</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>4135</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>isCDATA</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>433851</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parentid</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>433851</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>1892</a>
+                                    <b>1893</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>4135</a>
+                                    <b>4136</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>433851</a>
+                                    <b>433852</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>100499</a>
+                                    <b>100500</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>1892</a>
+                                    <b>1893</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>4135</a>
+                                    <b>4136</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>433851</a>
+                                    <b>433852</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>isCDATA</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>47</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>97</a>
+                                    <b>98</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>26494</a>
+                                    <b>26495</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>439958</a>
+                                    <b>439959</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>100518</a>
+                                    <b>100519</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>433851</a>
+                                    <b>433852</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>isCDATA</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>26494</a>
+                                    <b>26495</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>25303</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>35123</b>
+                                    <v>1191</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>text</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>25765</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>35123</b>
+                                    <v>729</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>parentid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>25312</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>35123</b>
+                                    <v>1182</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26397</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>97</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>fileid</src>
+                    <trg>isCDATA</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>26494</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>xmllocations</name>
+            <cardinality>3051056</cardinality>
+            <columnsizes>
+                <e>
+                    <k>xmlElement</k>
+                    <v>2982460</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>3051056</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>xmlElement</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2978326</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>24903</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>xmlElement</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3051056</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+    </stats>
 </dbstats>
diff --git a/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/old.dbscheme b/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/old.dbscheme
new file mode 100644
index 00000000000..bb0f279f2ac
--- /dev/null
+++ b/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/old.dbscheme
@@ -0,0 +1,2096 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+/*
+  case @macroinvocations.kind of
+    1 = macro expansion
+  | 2 = other macro reference
+  ;
+*/
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+  case @function.kind of
+    1 = normal
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(int id: @function ref, unique int entry_point: @stmt ref);
+
+function_return_type(int id: @function ref, int return_type: @type ref);
+
+/** If `function` is a coroutine, then this gives the
+    std::experimental::resumable_traits instance associated with it,
+    and the variables representing the `handle` and `promise` for it. */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref,
+  int handle: @variable ref,
+  int promise: @variable ref
+);
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+member_function_this_type(unique int id: @function ref, int this_type: @type ref);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(int new: @function ref, int old: @function ref);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/*
+  Built-in types are the fundamental types, e.g., integral, floating, and void.
+
+  case @builtintype.kind of
+    1 = error
+  | 2 = unknown
+  | 3 = void
+  | 4 = boolean
+  | 5 = char
+  | 6 = unsigned_char
+  | 7 = signed_char
+  | 8 = short
+  | 9 = unsigned_short
+  | 10 = signed_short
+  | 11 = int
+  | 12 = unsigned_int
+  | 13 = signed_int
+  | 14 = long
+  | 15 = unsigned_long
+  | 16 = signed_long
+  | 17 = long_long
+  | 18 = unsigned_long_long
+  | 19 = signed_long_long
+  | 20 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+  case @usertype.kind of
+    1 = struct
+  | 2 = class
+  | 3 = union
+  | 4 = enum
+  | 5 = typedef                       // classic C: typedef typedef type name
+  | 6 = template
+  | 7 = template_parameter
+  | 8 = template_template_parameter
+  | 9 = proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+  | 13 = scoped_enum
+  | 14 = using_alias                  // a using name = type style typedef
+  ;
+*/
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    unique string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the EDG frontend.  See symbol_ref.h there.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(unique int caller: @funbindexpr ref, int kind: int ref);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // EDG internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    unique int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..e9a518baf14
--- /dev/null
+++ b/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/semmlecode.cpp.dbscheme
@@ -0,0 +1,2096 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+/*
+  case @macroinvocations.kind of
+    1 = macro expansion
+  | 2 = other macro reference
+  ;
+*/
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+  case @function.kind of
+    1 = normal
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(int id: @function ref, unique int entry_point: @stmt ref);
+
+function_return_type(int id: @function ref, int return_type: @type ref);
+
+/** If `function` is a coroutine, then this gives the
+    std::experimental::resumable_traits instance associated with it,
+    and the variables representing the `handle` and `promise` for it. */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref,
+  int handle: @variable ref,
+  int promise: @variable ref
+);
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+member_function_this_type(unique int id: @function ref, int this_type: @type ref);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(int new: @function ref, int old: @function ref);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/*
+  Built-in types are the fundamental types, e.g., integral, floating, and void.
+
+  case @builtintype.kind of
+    1 = error
+  | 2 = unknown
+  | 3 = void
+  | 4 = boolean
+  | 5 = char
+  | 6 = unsigned_char
+  | 7 = signed_char
+  | 8 = short
+  | 9 = unsigned_short
+  | 10 = signed_short
+  | 11 = int
+  | 12 = unsigned_int
+  | 13 = signed_int
+  | 14 = long
+  | 15 = unsigned_long
+  | 16 = signed_long
+  | 17 = long_long
+  | 18 = unsigned_long_long
+  | 19 = signed_long_long
+  | 20 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+  case @usertype.kind of
+    1 = struct
+  | 2 = class
+  | 3 = union
+  | 4 = enum
+  | 5 = typedef                       // classic C: typedef typedef type name
+  | 6 = template
+  | 7 = template_parameter
+  | 8 = template_template_parameter
+  | 9 = proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+  | 13 = scoped_enum
+  | 14 = using_alias                  // a using name = type style typedef
+  ;
+*/
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the EDG frontend.  See symbol_ref.h there.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(unique int caller: @funbindexpr ref, int kind: int ref);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // EDG internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    unique int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/upgrade.properties b/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/upgrade.properties
new file mode 100644
index 00000000000..000fa581cfa
--- /dev/null
+++ b/cpp/ql/lib/upgrades/bb0f279f2acd793105a347d589b5afc8715d94c4/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove uniqueness constraint from the uuid property
+compatibility: full
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 283c0a92996..2125fbac519 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,24 @@
+## 0.0.11
+
+### Breaking Changes
+
+* The deprecated queries `cpp/duplicate-block`, `cpp/duplicate-function`, `cpp/duplicate-class`, `cpp/duplicate-file`, `cpp/mostly-duplicate-function`,`cpp/similar-file`, `cpp/duplicated-lines-in-files` have been removed.
+
+### Deprecated Predicates and Classes
+
+* The predicates and classes in the `CodeDuplication` library have been deprecated.
+
+### New Queries
+
+* A new query titled "Use of expired stack-address" (`cpp/using-expired-stack-address`) has been added.
+  This query finds accesses to expired stack-allocated memory that escaped via a global variable.
+* A new `cpp/insufficient-key-size` query has been added to the default query suite for C/C++. The query finds uses of certain cryptographic algorithms where the key size is too small to provide adequate encryption strength.
+
+### Minor Analysis Improvements
+
+* The "Failure to use HTTPS URLs" (`cpp/non-https-url`) has been improved reducing false positive results, and its precision has been increased to 'high'.
+* The `cpp/system-data-exposure` query has been modernized and has converted to a `path-problem` query. There are now fewer false positive results.
+
 ## 0.0.10
 
 ### Deprecated Classes
diff --git a/cpp/ql/src/Critical/OverflowDestination.ql b/cpp/ql/src/Critical/OverflowDestination.ql
index 94d46001660..6d41281e443 100644
--- a/cpp/ql/src/Critical/OverflowDestination.ql
+++ b/cpp/ql/src/Critical/OverflowDestination.ql
@@ -2,7 +2,7 @@
  * @name Copy function using source size
  * @description Calling a copy operation with a size derived from the source
  *              buffer instead of the destination buffer may result in a buffer overflow.
- * @kind problem
+ * @kind path-problem
  * @id cpp/overflow-destination
  * @problem.severity warning
  * @security-severity 9.3
@@ -14,7 +14,10 @@
  */
 
 import cpp
-import semmle.code.cpp.security.TaintTracking
+import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.controlflow.IRGuards
+import semmle.code.cpp.security.FlowSources
+import DataFlow::PathGraph
 
 /**
  * Holds if `fc` is a call to a copy operation where the size argument contains
@@ -27,9 +30,9 @@ predicate sourceSized(FunctionCall fc, Expr src) {
   fc.getTarget().hasGlobalOrStdName(["strncpy", "strncat", "memcpy", "memmove"]) and
   exists(Expr dest, Expr size, Variable v |
     fc.getArgument(0) = dest and
-    fc.getArgument(1) = src and
+    fc.getArgument(1).getFullyConverted() = src and
     fc.getArgument(2) = size and
-    src = v.getAnAccess() and
+    src = v.getAnAccess().getFullyConverted() and
     size.getAChild+() = v.getAnAccess() and
     // exception: `dest` is also referenced in the size argument
     not exists(Variable other |
@@ -45,9 +48,49 @@ predicate sourceSized(FunctionCall fc, Expr src) {
   )
 }
 
-from FunctionCall fc, Expr vuln, Expr taintSource
+predicate readsVariable(LoadInstruction load, Variable var) {
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
+}
+
+predicate hasUpperBoundsCheck(Variable var) {
+  exists(RelationalOperation oper, VariableAccess access |
+    oper.getAnOperand() = access and
+    access.getTarget() = var and
+    // Comparing to 0 is not an upper bound check
+    not oper.getAnOperand().getValue() = "0"
+  )
+}
+
+predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Variable checkedVar) {
+  readsVariable(node.asInstruction(), checkedVar) and
+  any(IRGuardCondition guard).ensuresEq(access, _, _, node.asInstruction().getBlock(), true)
+}
+
+class OverflowDestinationConfig extends TaintTracking::Configuration {
+  OverflowDestinationConfig() { this = "OverflowDestinationConfig" }
+
+  override predicate isSource(DataFlow::Node source) { source instanceof FlowSource }
+
+  override predicate isSink(DataFlow::Node sink) { sourceSized(_, sink.asConvertedExpr()) }
+
+  override predicate isSanitizer(DataFlow::Node node) {
+    exists(Variable checkedVar |
+      readsVariable(node.asInstruction(), checkedVar) and
+      hasUpperBoundsCheck(checkedVar)
+    )
+    or
+    exists(Variable checkedVar, Operand access |
+      readsVariable(access.getDef(), checkedVar) and
+      nodeIsBarrierEqualityCandidate(node, access, checkedVar)
+    )
+  }
+}
+
+from
+  FunctionCall fc, OverflowDestinationConfig conf, DataFlow::PathNode source,
+  DataFlow::PathNode sink
 where
-  sourceSized(fc, vuln) and
-  tainted(taintSource, vuln)
-select fc,
+  conf.hasFlowPath(source, sink) and
+  sourceSized(fc, sink.getNode().asConvertedExpr())
+select fc, source, sink,
   "To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size."
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql
index c75fb8b639d..dc5a0848296 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
@@ -18,157 +18,72 @@ import cpp
 // recomputing the IR.
 private import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.ir.IR
-import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow
+import semmle.code.cpp.ir.dataflow.MustFlow
+import PathGraph
 
 /** Holds if `f` has a name that we intrepret as evidence of intentionally returning the value of the stack pointer. */
 predicate intentionallyReturnsStackPointer(Function f) {
   f.getName().toLowerCase().matches(["%stack%", "%sp%"])
 }
 
-/**
- * Holds if `source` is a node that represents the use of a stack variable
- */
-predicate isSource(Node source) {
-  exists(VariableAddressInstruction var, Function func |
-    var = source.asInstruction() and
-    func = var.getEnclosingFunction() and
-    var.getASTVariable() instanceof StackVariable and
-    // Pointer-to-member types aren't properly handled in the dbscheme.
-    not var.getResultType() instanceof PointerToMemberType and
-    // Rule out FPs caused by extraction errors.
-    not any(ErrorExpr e).getEnclosingFunction() = func and
-    not intentionallyReturnsStackPointer(func)
-  )
-}
+class ReturnStackAllocatedMemoryConfig extends MustFlowConfiguration {
+  ReturnStackAllocatedMemoryConfig() { this = "ReturnStackAllocatedMemoryConfig" }
 
-/**
- * Holds if `sink` is a node that represents the `StoreInstruction` that is subsequently used in
- * a `ReturnValueInstruction`. We use the `StoreInstruction` instead of the instruction that defines the
- * `ReturnValueInstruction`'s source value oprand because the former has better location information.
- */
-predicate isSink(Node sink) {
-  exists(StoreInstruction store |
-    store.getDestinationAddress().(VariableAddressInstruction).getIRVariable() instanceof
-      IRReturnVariable and
-    sink.asOperand() = store.getSourceValueOperand()
-  )
-}
-
-/** Holds if `node1` _must_ flow to `node2`. */
-predicate step(Node node1, Node node2) {
-  instructionToOperandStep(node1.asInstruction(), node2.asOperand())
-  or
-  operandToInstructionStep(node1.asOperand(), node2.asInstruction())
-}
-
-predicate instructionToOperandStep(Instruction instr, Operand operand) { operand.getDef() = instr }
-
-/**
- * Holds if `operand` flows to the result of `instr`.
- *
- * This predicate ignores flow through `PhiInstruction`s to create a 'must flow' relation. It also
- * intentionally conflates addresses of fields and their object, and pointer offsets with their
- * base pointer as this allows us to detect cases where an object's address flows to a return statement
- * via a field. For example:
- *
- * ```cpp
- * struct S { int x, y };
- * int* test() {
- *   S s;
- *   return &s.x; // BAD: &s.x is an address of a variable on the stack.
- * }
- * ```
- */
-predicate operandToInstructionStep(Operand operand, Instruction instr) {
-  instr.(CopyInstruction).getSourceValueOperand() = operand
-  or
-  instr.(ConvertInstruction).getUnaryOperand() = operand
-  or
-  instr.(CheckedConvertOrNullInstruction).getUnaryOperand() = operand
-  or
-  instr.(InheritanceConversionInstruction).getUnaryOperand() = operand
-  or
-  instr.(FieldAddressInstruction).getObjectAddressOperand() = operand
-  or
-  instr.(PointerOffsetInstruction).getLeftOperand() = operand
-}
-
-/** Holds if a source node flows to `n`. */
-predicate branchlessLocalFlow0(Node n) {
-  isSource(n)
-  or
-  exists(Node mid |
-    branchlessLocalFlow0(mid) and
-    step(mid, n)
-  )
-}
-
-/** Holds if `n` is reachable through some source node, and `n` also eventually reaches a sink. */
-predicate branchlessLocalFlow1(Node n) {
-  branchlessLocalFlow0(n) and
-  (
-    isSink(n)
-    or
-    exists(Node mid |
-      branchlessLocalFlow1(mid) and
-      step(n, mid)
-    )
-  )
-}
-
-newtype TLocalPathNode =
-  TLocalPathNodeMid(Node n) {
-    branchlessLocalFlow1(n) and
-    (
-      isSource(n) or
-      exists(LocalPathNodeMid mid | step(mid.getNode(), n))
+  override predicate isSource(DataFlow::Node source) {
+    // Holds if `source` is a node that represents the use of a stack variable
+    exists(VariableAddressInstruction var, Function func |
+      var = source.asInstruction() and
+      func = var.getEnclosingFunction() and
+      var.getAstVariable() instanceof StackVariable and
+      // Pointer-to-member types aren't properly handled in the dbscheme.
+      not var.getResultType() instanceof PointerToMemberType and
+      // Rule out FPs caused by extraction errors.
+      not any(ErrorExpr e).getEnclosingFunction() = func and
+      not intentionallyReturnsStackPointer(func)
     )
   }
 
-abstract class LocalPathNode extends TLocalPathNode {
-  Node n;
+  override predicate isSink(DataFlow::Node sink) {
+    // Holds if `sink` is a node that represents the `StoreInstruction` that is subsequently used in
+    // a `ReturnValueInstruction`.
+    // We use the `StoreInstruction` instead of the instruction that defines the
+    // `ReturnValueInstruction`'s source value oprand because the former has better location information.
+    exists(StoreInstruction store |
+      store.getDestinationAddress().(VariableAddressInstruction).getIRVariable() instanceof
+        IRReturnVariable and
+      sink.asOperand() = store.getSourceValueOperand()
+    )
+  }
 
-  /** Gets the underlying node. */
-  Node getNode() { result = n }
-
-  /** Gets a textual representation of this node. */
-  string toString() { result = n.toString() }
-
-  /** Gets the location of this element. */
-  Location getLocation() { result = n.getLocation() }
-
-  /** Gets a successor `LocalPathNode`, if any. */
-  LocalPathNode getASuccessor() { step(this.getNode(), result.getNode()) }
+  /**
+   * This configuration intentionally conflates addresses of fields and their object, and pointer offsets
+   * with their base pointer as this allows us to detect cases where an object's address flows to a
+   * return statement via a field. For example:
+   *
+   * ```cpp
+   * struct S { int x, y };
+   * int* test() {
+   *   S s;
+   *   return &s.x; // BAD: &s.x is an address of a variable on the stack.
+   * }
+   * ```
+   */
+  override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node2.asInstruction().(FieldAddressInstruction).getObjectAddressOperand() = node1.asOperand()
+    or
+    node2.asInstruction().(PointerOffsetInstruction).getLeftOperand() = node1.asOperand()
+  }
 }
 
-class LocalPathNodeMid extends LocalPathNode, TLocalPathNodeMid {
-  LocalPathNodeMid() { this = TLocalPathNodeMid(n) }
-}
-
-class LocalPathNodeSink extends LocalPathNodeMid {
-  LocalPathNodeSink() { isSink(this.getNode()) }
-}
-
-/**
- * Holds if `source` is a source node, `sink` is a sink node, and there's flow
- * from `source` to `sink` using `step` relation.
- */
-predicate hasFlow(LocalPathNode source, LocalPathNodeSink sink) {
-  isSource(source.getNode()) and
-  source.getASuccessor+() = sink
-}
-
-predicate reach(LocalPathNode n) { n instanceof LocalPathNodeSink or reach(n.getASuccessor()) }
-
-query predicate edges(LocalPathNode a, LocalPathNode b) { a.getASuccessor() = b and reach(b) }
-
-query predicate nodes(LocalPathNode n, string key, string val) {
-  reach(n) and key = "semmle.label" and val = n.toString()
-}
-
-from LocalPathNode source, LocalPathNodeSink sink, VariableAddressInstruction var
+from
+  MustFlowPathNode source, MustFlowPathNode sink, VariableAddressInstruction var,
+  ReturnStackAllocatedMemoryConfig conf, Function f
 where
-  hasFlow(source, sink) and
-  source.getNode().asInstruction() = var
-select sink.getNode(), source, sink, "May return stack-allocated memory from $@.", var.getAST(),
-  var.getAST().toString()
+  conf.hasFlowPath(source, sink) and
+  source.getNode().asInstruction() = var and
+  // Only raise an alert if we're returning from the _same_ callable as the on that
+  // declared the stack variable.
+  var.getEnclosingFunction() = pragma[only_bind_into](f) and
+  sink.getNode().getEnclosingCallable() = pragma[only_bind_into](f)
+select sink.getNode(), source, sink, "May return stack-allocated memory from $@.", var.getAst(),
+  var.getAst().toString()
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql
index af847701f85..27aeabbaf49 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
@@ -19,7 +19,7 @@ import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.ir.IR
 
 predicate instructionHasVariable(VariableAddressInstruction vai, StackVariable var, Function f) {
-  var = vai.getASTVariable() and
+  var = vai.getAstVariable() and
   f = vai.getEnclosingFunction() and
   // Pointer-to-member types aren't properly handled in the dbscheme.
   not vai.getResultType() instanceof PointerToMemberType and
@@ -108,7 +108,7 @@ predicate inheritanceConversionTypes(
 
 /** Gets the HashCons value of an address computed by `instr`, if any. */
 TGlobalAddress globalAddress(Instruction instr) {
-  result = TGlobalVariable(instr.(VariableAddressInstruction).getASTVariable())
+  result = TGlobalVariable(instr.(VariableAddressInstruction).getAstVariable())
   or
   not instr instanceof LoadInstruction and
   result = globalAddress(instr.(CopyInstruction).getSourceValue())
diff --git a/cpp/ql/src/Likely Bugs/OO/UnsafeUseOfThis.ql b/cpp/ql/src/Likely Bugs/OO/UnsafeUseOfThis.ql
index 04325e8497e..32a97a4c8d3 100644
--- a/cpp/ql/src/Likely Bugs/OO/UnsafeUseOfThis.ql	
+++ b/cpp/ql/src/Likely Bugs/OO/UnsafeUseOfThis.ql	
@@ -17,169 +17,47 @@
 import cpp
 // We don't actually use the global value numbering library in this query, but without it we end up
 // recomputing the IR.
-private import semmle.code.cpp.valuenumbering.GlobalValueNumbering
-private import semmle.code.cpp.ir.IR
+import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+import semmle.code.cpp.ir.IR
+import semmle.code.cpp.ir.dataflow.MustFlow
+import PathGraph
 
-bindingset[n, result]
-int unbind(int n) { result >= n and result <= n }
+class UnsafeUseOfThisConfig extends MustFlowConfiguration {
+  UnsafeUseOfThisConfig() { this = "UnsafeUseOfThisConfig" }
 
-/** Holds if `p` is the `n`'th parameter of the non-virtual function `f`. */
-predicate parameterOf(Parameter p, Function f, int n) {
-  not f.isVirtual() and f.getParameter(n) = p
-}
+  override predicate isSource(DataFlow::Node source) { isSource(source, _, _) }
 
-/**
- * Holds if `instr` is the `n`'th argument to a call to the non-virtual function `f`, and
- * `init` is the corresponding initiazation instruction that receives the value of `instr` in `f`.
- */
-predicate flowIntoParameter(
-  CallInstruction call, Instruction instr, Function f, int n, InitializeParameterInstruction init
-) {
-  not f.isVirtual() and
-  call.getPositionalArgument(n) = instr and
-  f = call.getStaticCallTarget() and
-  getEnclosingNonVirtualFunctionInitializeParameter(init, f) and
-  init.getParameter().getIndex() = unbind(n)
-}
-
-/**
- * Holds if `instr` is an argument to a call to the function `f`, and `init` is the
- * corresponding initialization instruction that receives the value of `instr` in `f`.
- */
-pragma[noinline]
-predicate getPositionalArgumentInitParam(
-  CallInstruction call, Instruction instr, InitializeParameterInstruction init, Function f
-) {
-  exists(int n |
-    parameterOf(_, f, n) and
-    flowIntoParameter(call, instr, f, unbind(n), init)
-  )
-}
-
-/**
- * Holds if `instr` is the qualifier to a call to the non-virtual function `f`, and
- * `init` is the corresponding initiazation instruction that receives the value of
- * `instr` in `f`.
- */
-pragma[noinline]
-predicate getThisArgumentInitParam(
-  CallInstruction call, Instruction instr, InitializeParameterInstruction init, Function f
-) {
-  not f.isVirtual() and
-  call.getStaticCallTarget() = f and
-  getEnclosingNonVirtualFunctionInitializeParameter(init, f) and
-  call.getThisArgument() = instr and
-  init.getIRVariable() instanceof IRThisVariable
+  override predicate isSink(DataFlow::Node sink) { isSink(sink, _) }
 }
 
 /** Holds if `instr` is a `this` pointer used by the call instruction `call`. */
-predicate isSink(Instruction instr, CallInstruction call) {
+predicate isSink(DataFlow::Node sink, CallInstruction call) {
   exists(PureVirtualFunction func |
     call.getStaticCallTarget() = func and
-    call.getThisArgument() = instr and
+    call.getThisArgument() = sink.asInstruction() and
     // Weed out implicit calls to destructors of a base class
     not func instanceof Destructor
   )
 }
 
 /** Holds if `init` initializes the `this` pointer in class `c`. */
-predicate isSource(InitializeParameterInstruction init, string msg, Class c) {
-  (
-    exists(Constructor func |
-      not func instanceof CopyConstructor and
-      not func instanceof MoveConstructor and
-      func = init.getEnclosingFunction() and
-      msg = "construction"
-    )
-    or
-    init.getEnclosingFunction() instanceof Destructor and msg = "destruction"
-  ) and
-  init.getIRVariable() instanceof IRThisVariable and
-  init.getEnclosingFunction().getDeclaringType() = c
-}
-
-/**
- * Holds if `instr` flows to a sink (which is a use of the value of `instr` as a `this` pointer).
- */
-predicate flowsToSink(Instruction instr, Instruction sink) {
-  flowsFromSource(instr) and
-  (
-    isSink(instr, _) and instr = sink
-    or
-    exists(Instruction mid |
-      successor(instr, mid) and
-      flowsToSink(mid, sink)
-    )
+predicate isSource(DataFlow::Node source, string msg, Class c) {
+  exists(InitializeParameterInstruction init | init = source.asInstruction() |
+    (
+      exists(Constructor func |
+        not func instanceof CopyConstructor and
+        not func instanceof MoveConstructor and
+        func = init.getEnclosingFunction() and
+        msg = "construction"
+      )
+      or
+      init.getEnclosingFunction() instanceof Destructor and msg = "destruction"
+    ) and
+    init.getIRVariable() instanceof IRThisVariable and
+    init.getEnclosingFunction().getDeclaringType() = c
   )
 }
 
-/** Holds if `instr` flows from a source. */
-predicate flowsFromSource(Instruction instr) {
-  isSource(instr, _, _)
-  or
-  exists(Instruction mid |
-    successor(mid, instr) and
-    flowsFromSource(mid)
-  )
-}
-
-/** Holds if `f` is the enclosing non-virtual function of `init`. */
-predicate getEnclosingNonVirtualFunctionInitializeParameter(
-  InitializeParameterInstruction init, Function f
-) {
-  not f.isVirtual() and
-  init.getEnclosingFunction() = f
-}
-
-/** Holds if `f` is the enclosing non-virtual function of `init`. */
-predicate getEnclosingNonVirtualFunctionInitializeIndirection(
-  InitializeIndirectionInstruction init, Function f
-) {
-  not f.isVirtual() and
-  init.getEnclosingFunction() = f
-}
-
-/**
- * Holds if `instr` is an argument (or argument indirection) to a call, and
- * `succ` is the corresponding initialization instruction in the call target.
- */
-predicate flowThroughCallable(Instruction instr, Instruction succ) {
-  // Flow from an argument to a parameter
-  exists(CallInstruction call, InitializeParameterInstruction init | init = succ |
-    getPositionalArgumentInitParam(call, instr, init, call.getStaticCallTarget())
-    or
-    getThisArgumentInitParam(call, instr, init, call.getStaticCallTarget())
-  )
-  or
-  // Flow from argument indirection to parameter indirection
-  exists(
-    CallInstruction call, ReadSideEffectInstruction read, InitializeIndirectionInstruction init
-  |
-    init = succ and
-    read.getPrimaryInstruction() = call and
-    getEnclosingNonVirtualFunctionInitializeIndirection(init, call.getStaticCallTarget())
-  |
-    exists(int n |
-      read.getSideEffectOperand().getAnyDef() = instr and
-      read.getIndex() = n and
-      init.getParameter().getIndex() = unbind(n)
-    )
-    or
-    call.getThisArgument() = instr and
-    init.getIRVariable() instanceof IRThisVariable
-  )
-}
-
-/** Holds if `instr` flows to `succ`. */
-predicate successor(Instruction instr, Instruction succ) {
-  succ.(CopyInstruction).getSourceValue() = instr or
-  succ.(CheckedConvertOrNullInstruction).getUnary() = instr or
-  succ.(ChiInstruction).getTotal() = instr or
-  succ.(ConvertInstruction).getUnary() = instr or
-  succ.(InheritanceConversionInstruction).getUnary() = instr or
-  flowThroughCallable(instr, succ)
-}
-
 /**
  * Holds if:
  * - `source` is an initialization of a `this` pointer of type `sourceClass`, and
@@ -188,22 +66,19 @@ predicate successor(Instruction instr, Instruction succ) {
  * - `msg` is a string describing whether `source` is from a constructor or destructor.
  */
 predicate flows(
-  Instruction source, string msg, Class sourceClass, Instruction sink, CallInstruction call
+  MustFlowPathNode source, string msg, Class sourceClass, MustFlowPathNode sink,
+  CallInstruction call
 ) {
-  isSource(source, msg, sourceClass) and
-  flowsToSink(source, sink) and
-  isSink(sink, call)
+  exists(UnsafeUseOfThisConfig conf |
+    conf.hasFlowPath(source, sink) and
+    isSource(source.getNode(), msg, sourceClass) and
+    isSink(sink.getNode(), call)
+  )
 }
 
-query predicate edges(Instruction a, Instruction b) { successor(a, b) and flowsToSink(b, _) }
-
-query predicate nodes(Instruction n, string key, string val) {
-  flowsToSink(n, _) and
-  key = "semmle.label" and
-  val = n.toString()
-}
-
-from Instruction source, Instruction sink, CallInstruction call, string msg, Class sourceClass
+from
+  MustFlowPathNode source, MustFlowPathNode sink, CallInstruction call, string msg,
+  Class sourceClass
 where
   flows(source, msg, sourceClass, sink, call) and
   // Only raise an alert if there is no override of the pure virtual function in any base class.
diff --git a/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql b/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql
index 65ba665dff2..8d7a07f4335 100644
--- a/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql	
+++ b/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql	
@@ -52,7 +52,7 @@ predicate explicitNullTestOfInstruction(Instruction checked, Instruction bool) {
 pragma[noinline]
 predicate candidateResult(LoadInstruction checked, ValueNumber value, IRBlock dominator) {
   explicitNullTestOfInstruction(checked, _) and
-  not checked.getAST().isInMacroExpansion() and
+  not checked.getAst().isInMacroExpansion() and
   value.getAnInstruction() = checked and
   dominator.dominates(checked.getBlock())
 }
diff --git a/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp b/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp
deleted file mode 100644
index 80dd9f98e63..00000000000
--- a/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<include src="FLinesOfDuplicatedCodeCommon.inc.qhelp" />
-</qhelp>
\ No newline at end of file
diff --git a/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.ql b/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.ql
deleted file mode 100644
index 8b46df05adc..00000000000
--- a/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCode.ql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @deprecated
- * @name Duplicated lines in files
- * @description The number of lines in a file, including code, comment
- *              and whitespace lines, which are duplicated in at least
- *              one other place.
- * @kind treemap
- * @treemap.warnOn highValues
- * @metricType file
- * @metricAggregate avg sum max
- * @id cpp/duplicated-lines-in-files
- * @tags testability
- *       modularity
- */
-
-import external.CodeDuplication
-
-from File f, int n
-where
-  n =
-    count(int line |
-      exists(DuplicateBlock d | d.sourceFile() = f |
-        line in [d.sourceStartLine() .. d.sourceEndLine()]
-      ) and
-      not whitelistedLineForDuplication(f, line)
-    )
-select f, n order by n desc
diff --git a/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp b/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
deleted file mode 100644
index 6fc36156c11..00000000000
--- a/cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<overview>
-
-<p>
-This metric measures the number of lines in a file that are contained within a block that is duplicated elsewhere. These lines may include code, comments and whitespace, and the duplicate block may be in this file or in another file.
-</p>
-
-<p>
-A file that contains many lines that are duplicated within the code base is problematic
-for a number of reasons.
-</p>
-
-</overview>
-<include src="DuplicationProblems.inc.qhelp" />
-
-<recommendation>
-
-<p>
-Refactor files with lots of duplicated code to extract the common code into
-a shared library or module.
-</p>
-
-</recommendation>
-<references> 
-
-
-<li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Duplicate_code">Duplicate code</a>.</li>
-<li>M. Fowler, <em>Refactoring</em>. Addison-Wesley, 1999.</li>
-
-
-</references>
-</qhelp>
diff --git a/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql
index 8c75e8da6e2..bebff32a5c1 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql
@@ -11,7 +11,7 @@
 import cpp
 import ExternalAPIs
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll
index 29d5b20cfc4..0636dcbe11b 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll
@@ -9,28 +9,31 @@ private import semmle.code.cpp.models.interfaces.Taint
 import ExternalAPIsSpecific
 
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Function f, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Function f, int index) {
+    exists(UntrustedExternalApiDataNode n |
       f = n.getExternalFunction() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getExternalFunction(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getExternalFunction(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -43,8 +46,11 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Function f, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(f, index) and
+      this = TExternalApiParameter(f, index) and
       result = f.toString() + " [" + indexString + "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
index 5e710c9548d..db236b510b9 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
@@ -8,11 +8,11 @@ import semmle.code.cpp.models.interfaces.DataFlow
 import SafeExternalAPIFunction
 
 /** A node representing untrusted data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     // Argument to call to a function
     (
       this.asExpr() = call.getArgument(i)
@@ -27,7 +27,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
       not f instanceof DataFlowFunction and
       not f instanceof TaintFunction and
       // Not a call to a known safe external API
-      not f instanceof SafeExternalAPIFunction
+      not f instanceof SafeExternalApiFunction
     )
   }
 
@@ -41,9 +41,12 @@ class ExternalAPIDataNode extends DataFlow::Node {
   string getFunctionDescription() { result = this.getExternalFunction().toString() }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) {
     exists(RemoteFlowSourceFunction remoteFlow |
@@ -52,5 +55,8 @@ class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
     )
   }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
+
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql
index 4d0c2174809..69911c22c6a 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql
@@ -11,7 +11,7 @@
 import cpp
 import ir.ExternalAPIs
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql
index 47a0bf14b7f..4860fc5356f 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql
@@ -15,8 +15,8 @@ import ir.ExternalAPIs
 import semmle.code.cpp.security.FlowSources
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getExternalFunction().toString() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getExternalFunction().toString() +
     " with untrusted data from $@.", source, source.getNode().(RemoteFlowSource).getSourceType()
diff --git a/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll b/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll
index 5eb0b23d914..de59e82e552 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll
@@ -8,11 +8,14 @@ private import semmle.code.cpp.models.interfaces.SideEffect
 /**
  * A `Function` that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPIFunction extends Function { }
+abstract class SafeExternalApiFunction extends Function { }
+
+/** DEPRECATED: Alias for SafeExternalApiFunction */
+deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPIFunction extends SafeExternalAPIFunction {
-  DefaultSafeExternalAPIFunction() {
+private class DefaultSafeExternalApiFunction extends SafeExternalApiFunction {
+  DefaultSafeExternalApiFunction() {
     // If a function does not write to any of its arguments, we consider it safe to
     // pass untrusted data to it. This means that string functions such as `strcmp`
     // and `strlen`, as well as memory functions such as `memcmp`, are considered safe.
diff --git a/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
index b85a5b26a7f..01067425190 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
@@ -14,8 +14,8 @@ import semmle.code.cpp.dataflow.TaintTracking
 import ExternalAPIs
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getExternalFunction().toString() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getExternalFunction().toString() +
     " with untrusted data from $@.", source, source.toString()
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll
index 29d5b20cfc4..0636dcbe11b 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll
@@ -9,28 +9,31 @@ private import semmle.code.cpp.models.interfaces.Taint
 import ExternalAPIsSpecific
 
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Function f, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Function f, int index) {
+    exists(UntrustedExternalApiDataNode n |
       f = n.getExternalFunction() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getExternalFunction(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getExternalFunction(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -43,8 +46,11 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Function f, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(f, index) and
+      this = TExternalApiParameter(f, index) and
       result = f.toString() + " [" + indexString + "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll
index 994e76d6ced..b0fa685d1a4 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll
@@ -8,11 +8,11 @@ private import semmle.code.cpp.models.interfaces.DataFlow
 import SafeExternalAPIFunction
 
 /** A node representing untrusted data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     // Argument to call to a function
     (
       this.asExpr() = call.getArgument(i)
@@ -27,7 +27,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
       not f instanceof DataFlowFunction and
       not f instanceof TaintFunction and
       // Not a call to a known safe external API
-      not f instanceof SafeExternalAPIFunction
+      not f instanceof SafeExternalApiFunction
     )
   }
 
@@ -41,11 +41,17 @@ class ExternalAPIDataNode extends DataFlow::Node {
   string getFunctionDescription() { result = this.getExternalFunction().toString() }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfigIR" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfigIR" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
+
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll b/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll
index 5eb0b23d914..de59e82e552 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll
@@ -8,11 +8,14 @@ private import semmle.code.cpp.models.interfaces.SideEffect
 /**
  * A `Function` that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPIFunction extends Function { }
+abstract class SafeExternalApiFunction extends Function { }
+
+/** DEPRECATED: Alias for SafeExternalApiFunction */
+deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPIFunction extends SafeExternalAPIFunction {
-  DefaultSafeExternalAPIFunction() {
+private class DefaultSafeExternalApiFunction extends SafeExternalApiFunction {
+  DefaultSafeExternalApiFunction() {
     // If a function does not write to any of its arguments, we consider it safe to
     // pass untrusted data to it. This means that string functions such as `strcmp`
     // and `strlen`, as well as memory functions such as `memcmp`, are considered safe.
diff --git a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
index 92c8b9a2bd5..1f8a5023864 100644
--- a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
@@ -18,15 +18,15 @@ import semmle.code.cpp.security.FunctionWithWrappers
 import semmle.code.cpp.security.TaintTracking
 import TaintedWithPath
 
-class SQLLikeFunction extends FunctionWithWrappers {
-  SQLLikeFunction() { sqlArgument(this.getName(), _) }
+class SqlLikeFunction extends FunctionWithWrappers {
+  SqlLikeFunction() { sqlArgument(this.getName(), _) }
 
   override predicate interestingArg(int arg) { sqlArgument(this.getName(), arg) }
 }
 
 class Configuration extends TaintTrackingConfiguration {
   override predicate isSink(Element tainted) {
-    exists(SQLLikeFunction runSql | runSql.outermostWrapperFunctionCall(tainted, _))
+    exists(SqlLikeFunction runSql | runSql.outermostWrapperFunctionCall(tainted, _))
   }
 
   override predicate isBarrier(Expr e) {
@@ -43,7 +43,7 @@ class Configuration extends TaintTrackingConfiguration {
 }
 
 from
-  SQLLikeFunction runSql, Expr taintedArg, Expr taintSource, PathNode sourceNode, PathNode sinkNode,
+  SqlLikeFunction runSql, Expr taintedArg, Expr taintSource, PathNode sourceNode, PathNode sinkNode,
   string taintCause, string callChain
 where
   runSql.outermostWrapperFunctionCall(taintedArg, callChain) and
diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 0621def4d98..f16bb1e25d9 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -3,18 +3,22 @@
  * @description Accessing an array without first checking
  *              that the index is within the bounds of the array can
  *              cause undefined behavior and can also be a security risk.
- * @kind problem
+ * @kind path-problem
  * @id cpp/unclear-array-index-validation
  * @problem.severity warning
  * @security-severity 8.8
+ * @precision low
  * @tags security
  *       external/cwe/cwe-129
  */
 
 import cpp
-import semmle.code.cpp.controlflow.Guards
-private import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
-import semmle.code.cpp.security.TaintTracking
+import semmle.code.cpp.controlflow.IRGuards
+import semmle.code.cpp.security.FlowSources
+import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
+import DataFlow::PathGraph
+import semmle.code.cpp.security.Security
 
 predicate hasUpperBound(VariableAccess offsetExpr) {
   exists(BasicBlock controlled, StackVariable offsetVar, SsaDefinition def |
@@ -32,11 +36,92 @@ predicate linearBoundControls(BasicBlock controlled, SsaDefinition def, StackVar
   )
 }
 
-from Expr origin, ArrayExpr arrayExpr, VariableAccess offsetExpr
+predicate readsVariable(LoadInstruction load, Variable var) {
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
+}
+
+predicate hasUpperBoundsCheck(Variable var) {
+  exists(RelationalOperation oper, VariableAccess access |
+    oper.getAnOperand() = access and
+    access.getTarget() = var and
+    // Comparing to 0 is not an upper bound check
+    not oper.getAnOperand().getValue() = "0"
+  )
+}
+
+predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Variable checkedVar) {
+  readsVariable(node.asInstruction(), checkedVar) and
+  any(IRGuardCondition guard).ensuresEq(access, _, _, node.asInstruction().getBlock(), true)
+}
+
+predicate isFlowSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
+
+predicate predictableInstruction(Instruction instr) {
+  instr instanceof ConstantInstruction
+  or
+  instr instanceof StringConstantInstruction
+  or
+  // This could be a conversion on a string literal
+  predictableInstruction(instr.(UnaryInstruction).getUnary())
+}
+
+class ImproperArrayIndexValidationConfig extends TaintTracking::Configuration {
+  ImproperArrayIndexValidationConfig() { this = "ImproperArrayIndexValidationConfig" }
+
+  override predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
+
+  override predicate isSanitizer(DataFlow::Node node) {
+    hasUpperBound(node.asExpr())
+    or
+    // These barriers are ported from `DefaultTaintTracking` because this query is quite noisy
+    // otherwise.
+    exists(Variable checkedVar |
+      readsVariable(node.asInstruction(), checkedVar) and
+      hasUpperBoundsCheck(checkedVar)
+    )
+    or
+    exists(Variable checkedVar, Operand access |
+      readsVariable(access.getDef(), checkedVar) and
+      nodeIsBarrierEqualityCandidate(node, access, checkedVar)
+    )
+    or
+    // Don't use dataflow into binary instructions if both operands are unpredictable
+    exists(BinaryInstruction iTo |
+      iTo = node.asInstruction() and
+      not predictableInstruction(iTo.getLeft()) and
+      not predictableInstruction(iTo.getRight()) and
+      // propagate taint from either the pointer or the offset, regardless of predictability
+      not iTo instanceof PointerArithmeticInstruction
+    )
+    or
+    // don't use dataflow through calls to pure functions if two or more operands
+    // are unpredictable
+    exists(Instruction iFrom1, Instruction iFrom2, CallInstruction iTo |
+      iTo = node.asInstruction() and
+      isPureFunction(iTo.getStaticCallTarget().getName()) and
+      iFrom1 = iTo.getAnArgument() and
+      iFrom2 = iTo.getAnArgument() and
+      not predictableInstruction(iFrom1) and
+      not predictableInstruction(iFrom2) and
+      iFrom1 != iFrom2
+    )
+  }
+
+  override predicate isSink(DataFlow::Node sink) {
+    exists(ArrayExpr arrayExpr, VariableAccess offsetExpr |
+      offsetExpr = arrayExpr.getArrayOffset() and
+      sink.asExpr() = offsetExpr and
+      not hasUpperBound(offsetExpr)
+    )
+  }
+}
+
+from
+  ImproperArrayIndexValidationConfig conf, DataFlow::PathNode source, DataFlow::PathNode sink,
+  string sourceType
 where
-  tainted(origin, offsetExpr) and
-  offsetExpr = arrayExpr.getArrayOffset() and
-  not hasUpperBound(offsetExpr)
-select offsetExpr,
+  conf.hasFlowPath(source, sink) and
+  isFlowSource(source.getNode(), sourceType)
+select sink.getNode(), source, sink,
   "$@ flows to here and is used in an array indexing expression, potentially causing an invalid access.",
-  origin, "User-provided value"
+  source.getNode(), sourceType
diff --git a/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql b/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
index 585875798cc..49de733d381 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
@@ -15,55 +15,89 @@
 
 import cpp
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
-import semmle.code.cpp.security.TaintTracking
-import TaintedWithPath
+import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.ir.IR
+import semmle.code.cpp.controlflow.IRGuards
+import semmle.code.cpp.security.FlowSources
+import DataFlow::PathGraph
 
 /**
  * Holds if `alloc` is an allocation, and `tainted` is a child of it that is a
  * taint sink.
  */
-predicate allocSink(Expr alloc, Expr tainted) {
-  isAllocationExpr(alloc) and
-  tainted = alloc.getAChild() and
-  tainted.getUnspecifiedType() instanceof IntegralType
-}
-
-class TaintedAllocationSizeConfiguration extends TaintTrackingConfiguration {
-  override predicate isSink(Element tainted) { allocSink(_, tainted) }
-
-  override predicate isBarrier(Expr e) {
-    super.isBarrier(e)
-    or
-    // There can be two separate reasons for `convertedExprMightOverflow` not holding:
-    // 1. `e` really cannot overflow.
-    // 2. `e` isn't analyzable.
-    // If we didn't rule out case 2 we would place barriers on anything that isn't analyzable.
-    (
-      e instanceof UnaryArithmeticOperation or
-      e instanceof BinaryArithmeticOperation or
-      e instanceof AssignArithmeticOperation
-    ) and
-    not convertedExprMightOverflow(e)
-    or
-    // Subtracting two pointers is either well-defined (and the result will likely be small), or
-    // terribly undefined and dangerous. Here, we assume that the programmer has ensured that the
-    // result is well-defined (i.e., the two pointers point to the same object), and thus the result
-    // will likely be small.
-    e = any(PointerDiffExpr diff).getAnOperand()
-  }
-}
-
-predicate taintedAllocSize(
-  Expr source, Expr alloc, PathNode sourceNode, PathNode sinkNode, string taintCause
-) {
-  isUserInput(source, taintCause) and
-  exists(Expr tainted |
-    allocSink(alloc, tainted) and
-    taintedWithPath(source, tainted, sourceNode, sinkNode)
+predicate allocSink(Expr alloc, DataFlow::Node sink) {
+  exists(Expr e | e = sink.asConvertedExpr() |
+    isAllocationExpr(alloc) and
+    e = alloc.getAChild() and
+    e.getUnspecifiedType() instanceof IntegralType
   )
 }
 
-from Expr source, Expr alloc, PathNode sourceNode, PathNode sinkNode, string taintCause
-where taintedAllocSize(source, alloc, sourceNode, sinkNode, taintCause)
-select alloc, sourceNode, sinkNode, "This allocation size is derived from $@ and might overflow",
-  source, "user input (" + taintCause + ")"
+predicate readsVariable(LoadInstruction load, Variable var) {
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
+}
+
+predicate hasUpperBoundsCheck(Variable var) {
+  exists(RelationalOperation oper, VariableAccess access |
+    oper.getAnOperand() = access and
+    access.getTarget() = var and
+    // Comparing to 0 is not an upper bound check
+    not oper.getAnOperand().getValue() = "0"
+  )
+}
+
+predicate nodeIsBarrierEqualityCandidate(DataFlow::Node node, Operand access, Variable checkedVar) {
+  readsVariable(node.asInstruction(), checkedVar) and
+  any(IRGuardCondition guard).ensuresEq(access, _, _, node.asInstruction().getBlock(), true)
+}
+
+predicate isFlowSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
+
+class TaintedAllocationSizeConfiguration extends TaintTracking::Configuration {
+  TaintedAllocationSizeConfiguration() { this = "TaintedAllocationSizeConfiguration" }
+
+  override predicate isSource(DataFlow::Node source) { isFlowSource(source, _) }
+
+  override predicate isSink(DataFlow::Node sink) { allocSink(_, sink) }
+
+  override predicate isSanitizer(DataFlow::Node node) {
+    exists(Expr e | e = node.asExpr() |
+      // There can be two separate reasons for `convertedExprMightOverflow` not holding:
+      // 1. `e` really cannot overflow.
+      // 2. `e` isn't analyzable.
+      // If we didn't rule out case 2 we would place barriers on anything that isn't analyzable.
+      (
+        e instanceof UnaryArithmeticOperation or
+        e instanceof BinaryArithmeticOperation or
+        e instanceof AssignArithmeticOperation
+      ) and
+      not convertedExprMightOverflow(e)
+      or
+      // Subtracting two pointers is either well-defined (and the result will likely be small), or
+      // terribly undefined and dangerous. Here, we assume that the programmer has ensured that the
+      // result is well-defined (i.e., the two pointers point to the same object), and thus the result
+      // will likely be small.
+      e = any(PointerDiffExpr diff).getAnOperand()
+    )
+    or
+    exists(Variable checkedVar |
+      readsVariable(node.asInstruction(), checkedVar) and
+      hasUpperBoundsCheck(checkedVar)
+    )
+    or
+    exists(Variable checkedVar, Operand access |
+      readsVariable(access.getDef(), checkedVar) and
+      nodeIsBarrierEqualityCandidate(node, access, checkedVar)
+    )
+  }
+}
+
+from
+  Expr alloc, DataFlow::PathNode source, DataFlow::PathNode sink, string taintCause,
+  TaintedAllocationSizeConfiguration conf
+where
+  isFlowSource(source.getNode(), taintCause) and
+  conf.hasFlowPath(source, sink) and
+  allocSink(alloc, sink.getNode())
+select alloc, source, sink, "This allocation size is derived from $@ and might overflow",
+  source.getNode(), "user input (" + taintCause + ")"
diff --git a/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql b/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
index 1410873a06b..13e72842fba 100644
--- a/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
+++ b/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
@@ -3,6 +3,7 @@
  * @description Non-HTTPS connections can be intercepted by third parties.
  * @kind path-problem
  * @problem.severity warning
+ * @security-severity 8.1
  * @precision high
  * @id cpp/non-https-url
  * @tags security
diff --git a/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.c b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.c
new file mode 100644
index 00000000000..0d4ba9feb8f
--- /dev/null
+++ b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.c
@@ -0,0 +1,8 @@
+void encrypt_with_openssl(EVP_PKEY_CTX *ctx) {
+
+  // BAD: only 1024 bits for an RSA key
+  EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 1024);
+
+  // GOOD: 2048 bits for an RSA key
+  EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048);
+}
\ No newline at end of file
diff --git a/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp
new file mode 100644
index 00000000000..a0402119ba8
--- /dev/null
+++ b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.qhelp
@@ -0,0 +1,38 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>Using cryptographic algorithms with a small key size can leave data vulnerable to being decrypted.</p>
+
+<p>Many cryptographic algorithms provided by cryptography libraries can be configured with key sizes that are
+vulnerable to brute force attacks. Using such a key size means that an attacker may be able to easily decrypt the
+encrypted data.</p>
+
+</overview>
+<recommendation>
+
+<p>Ensure that you use a strong, modern cryptographic algorithm. Use at least AES-128 or RSA-2048.</p>
+
+</recommendation>
+<example>
+
+<p>The following code shows an example of using the <code>openssl</code> library to generate an RSA key.
+When creating a key, you must specify which key size to use. The first example uses 1024 bits, which is not
+considered sufficient. The second example uses 2048 bits, which is currently considered sufficient.</p>
+
+<sample src="InsufficientKeySize.c" />
+
+</example>
+<references>
+
+<li>NIST, FIPS 140 Annex a: <a href="http://csrc.nist.gov/publications/fips/fips140-2/fips1402annexa.pdf">
+Approved Security Functions</a>.</li>
+<li>NIST, SP 800-131A: <a href="https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf">
+Transitions: Recommendation for Transitioning the Use of Cryptographic Algorithms and Key Lengths</a>.</li>
+
+<!--  LocalWords:  CWE
+ -->
+
+</references>
+</qhelp>
diff --git a/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql
new file mode 100644
index 00000000000..202e9fb225d
--- /dev/null
+++ b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql
@@ -0,0 +1,64 @@
+/**
+ * @name Use of a cryptographic algorithm with insufficient key size
+ * @description Using cryptographic algorithms with too small a key size can
+ *              allow an attacker to compromise security.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 7.5
+ * @precision high
+ * @id cpp/insufficient-key-size
+ * @tags security
+ *       external/cwe/cwe-326
+ */
+
+import cpp
+import semmle.code.cpp.ir.dataflow.DataFlow
+import semmle.code.cpp.ir.IR
+import DataFlow::PathGraph
+
+// Gets the recommended minimum key size (in bits) of `func`, the name of an encryption function that accepts a key size as parameter `paramIndex`
+int getMinimumKeyStrength(string func, int paramIndex) {
+  func =
+    [
+      "EVP_PKEY_CTX_set_dsa_paramgen_bits", "DSA_generate_parameters_ex",
+      "EVP_PKEY_CTX_set_rsa_keygen_bits", "RSA_generate_key_ex", "RSA_generate_key_fips",
+      "EVP_PKEY_CTX_set_dh_paramgen_prime_len", "DH_generate_parameters_ex"
+    ] and
+  paramIndex = 1 and
+  result = 2048
+}
+
+class KeyStrengthFlow extends DataFlow::Configuration {
+  KeyStrengthFlow() { this = "KeyStrengthFlow" }
+
+  override predicate isSource(DataFlow::Node node) {
+    exists(int bits |
+      node.asInstruction().(IntegerConstantInstruction).getValue().toInt() = bits and
+      bits < getMinimumKeyStrength(_, _) and
+      bits > 0 // exclude sentinel values
+    )
+  }
+
+  override predicate isSink(DataFlow::Node node) {
+    exists(FunctionCall fc, string name, int param |
+      node.asExpr() = fc.getArgument(param) and
+      fc.getTarget().hasGlobalName(name) and
+      exists(getMinimumKeyStrength(name, param))
+    )
+  }
+}
+
+from
+  DataFlow::PathNode source, DataFlow::PathNode sink, KeyStrengthFlow conf, FunctionCall fc,
+  int param, string name, int minimumBits, int bits
+where
+  conf.hasFlowPath(source, sink) and
+  sink.getNode().asExpr() = fc.getArgument(param) and
+  fc.getTarget().hasGlobalName(name) and
+  minimumBits = getMinimumKeyStrength(name, param) and
+  bits = source.getNode().asInstruction().(ConstantValueInstruction).getValue().toInt() and
+  bits < minimumBits and
+  bits != 0
+select fc, source, sink,
+  "The key size $@ is less than the recommended key size of " + minimumBits.toString() + " bits.",
+  source, bits.toString()
diff --git a/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql b/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
index 2a3fbfa793e..31a152a167a 100644
--- a/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
+++ b/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
@@ -6,7 +6,7 @@
  * @kind path-problem
  * @problem.severity warning
  * @security-severity 6.5
- * @precision medium
+ * @precision high
  * @id cpp/system-data-exposure
  * @tags security
  *       external/cwe/cwe-497
@@ -46,8 +46,8 @@ class EnvData extends SystemData {
 /**
  * Data originating from a call to `mysql_get_client_info()`.
  */
-class SQLClientInfo extends SystemData {
-  SQLClientInfo() { this.(FunctionCall).getTarget().hasName("mysql_get_client_info") }
+class SqlClientInfo extends SystemData {
+  SqlClientInfo() { this.(FunctionCall).getTarget().hasName("mysql_get_client_info") }
 
   override Expr getAnExpr() { result = this }
 }
@@ -63,8 +63,8 @@ private predicate sqlConnectInfo(FunctionCall source, VariableAccess use) {
 /**
  * Data passed into an SQL connect function.
  */
-class SQLConnectInfo extends SystemData {
-  SQLConnectInfo() { sqlConnectInfo(this, _) }
+class SqlConnectInfo extends SystemData {
+  SqlConnectInfo() { sqlConnectInfo(this, _) }
 
   override Expr getAnExpr() { sqlConnectInfo(this, result) }
 }
diff --git a/cpp/ql/src/change-notes/2022-02-10-system-data-exposure.md b/cpp/ql/src/change-notes/2022-02-10-system-data-exposure.md
deleted file mode 100644
index 2492920de70..00000000000
--- a/cpp/ql/src/change-notes/2022-02-10-system-data-exposure.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `cpp/system-data-exposure` query has been modernized and has converted to a `path-problem` query. There are now fewer false positive results.
diff --git a/cpp/ql/src/change-notes/2022-02-22-using-expired-stack-address.md b/cpp/ql/src/change-notes/2022-02-22-using-expired-stack-address.md
deleted file mode 100644
index 6da48a433da..00000000000
--- a/cpp/ql/src/change-notes/2022-02-22-using-expired-stack-address.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: newQuery
----
-
-- A new query titled "Use of expired stack-address" (`cpp/using-expired-stack-address`) has been added.
-  This query finds accesses to expired stack-allocated memory that escaped via a global variable.
diff --git a/cpp/ql/src/change-notes/2022-02-24-non-https-url.md b/cpp/ql/src/change-notes/2022-02-24-non-https-url.md
deleted file mode 100644
index ac1523d5e53..00000000000
--- a/cpp/ql/src/change-notes/2022-02-24-non-https-url.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The "Failure to use HTTPS URLs" (`cpp/non-https-url`) has been improved reducing false positive results, and its precision has been increased to 'high'.
diff --git a/cpp/ql/src/change-notes/2022-03-07-system-data-exposure.md b/cpp/ql/src/change-notes/2022-03-07-system-data-exposure.md
new file mode 100644
index 00000000000..372a3a8391b
--- /dev/null
+++ b/cpp/ql/src/change-notes/2022-03-07-system-data-exposure.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/system-data-exposure` query has been increased from `medium` to `high` precision, following a number of improvements to the query logic.
diff --git a/cpp/ql/src/change-notes/2022-03-10-port-three-queries-to-taint-tracking.md b/cpp/ql/src/change-notes/2022-03-10-port-three-queries-to-taint-tracking.md
new file mode 100644
index 00000000000..249249152f7
--- /dev/null
+++ b/cpp/ql/src/change-notes/2022-03-10-port-three-queries-to-taint-tracking.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/overflow-destination`, `cpp/unclear-array-index-validation`, and `cpp/uncontrolled-allocation-size` queries have been modernized and converted to `path-problem` queries and provide more true positive results.
diff --git a/cpp/ql/src/change-notes/released/0.0.11.md b/cpp/ql/src/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..589cd05a6fb
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/0.0.11.md
@@ -0,0 +1,20 @@
+## 0.0.11
+
+### Breaking Changes
+
+* The deprecated queries `cpp/duplicate-block`, `cpp/duplicate-function`, `cpp/duplicate-class`, `cpp/duplicate-file`, `cpp/mostly-duplicate-function`,`cpp/similar-file`, `cpp/duplicated-lines-in-files` have been removed.
+
+### Deprecated Predicates and Classes
+
+* The predicates and classes in the `CodeDuplication` library have been deprecated.
+
+### New Queries
+
+* A new query titled "Use of expired stack-address" (`cpp/using-expired-stack-address`) has been added.
+  This query finds accesses to expired stack-allocated memory that escaped via a global variable.
+* A new `cpp/insufficient-key-size` query has been added to the default query suite for C/C++. The query finds uses of certain cryptographic algorithms where the key size is too small to provide adequate encryption strength.
+
+### Minor Analysis Improvements
+
+* The "Failure to use HTTPS URLs" (`cpp/non-https-url`) has been improved reducing false positive results, and its precision has been increased to 'high'.
+* The `cpp/system-data-exposure` query has been modernized and has converted to a `path-problem` query. There are now fewer false positive results.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.cpp b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.cpp
new file mode 100644
index 00000000000..6a16e992471
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.cpp
@@ -0,0 +1,5 @@
+...
+  vUnsignedLong = (unsigned long)(vUnsignedInt*vUnsignedInt); // BAD
+...
+  vUnsignedLong = ((unsigned long)vUnsignedInt*vUnsignedInt); // GOOD
+...
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.qhelp b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.qhelp
new file mode 100644
index 00000000000..458b5e50866
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>Search for places where the result of the multiplication is subjected to explicit conversion, not the arguments. Therefore, during the multiplication period, you can lose meaningful data.</p>
+
+
+</overview>
+
+<example>
+<p>The following example demonstrates erroneous and fixed methods for working with type conversion.</p>
+<sample src="DangerousUseOfTransformationAfterOperation.cpp" />
+
+</example>
+<references>
+
+<li>
+  CERT C Coding Standard:
+  <a href="https://wiki.sei.cmu.edu/confluence/display/c/INT30-C.+Ensure+that+unsigned+integer+operations+do+not+wrap">INT30-C. Ensure that unsigned integer operations do not wrap</a>.
+</li>
+
+</references>
+</qhelp>
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql
new file mode 100644
index 00000000000..0bebc69a8bf
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql
@@ -0,0 +1,102 @@
+/**
+ * @name Dangerous use of transformation after operation.
+ * @description By using the transformation after the operation, you are doing a pointless and dangerous action.
+ * @kind problem
+ * @id cpp/dangerous-use-of-transformation-after-operation
+ * @problem.severity warning
+ * @precision medium
+ * @tags correctness
+ *       security
+ *       external/cwe/cwe-190
+ */
+
+import cpp
+
+/** Returns the number of the expression in the function call arguments. */
+int argumentPosition(FunctionCall fc, Expr exp, int n) {
+  n in [0 .. fc.getNumberOfArguments() - 1] and
+  fc.getArgument(n) = exp and
+  result = n
+}
+
+/** Holds if a nonsensical type conversion situation is found. */
+predicate conversionDoneLate(MulExpr mexp) {
+  exists(Expr e1, Expr e2 |
+    mexp.hasOperands(e1, e2) and
+    not e1.isConstant() and
+    not e1.hasConversion() and
+    not e1.hasConversion() and
+    (
+      e2.isConstant() or
+      not e2.hasConversion()
+    ) and
+    mexp.getConversion().hasExplicitConversion() and
+    mexp.getConversion() instanceof ParenthesisExpr and
+    mexp.getConversion().getConversion() instanceof CStyleCast and
+    mexp.getConversion().getConversion().getType().getSize() > mexp.getType().getSize() and
+    mexp.getConversion().getConversion().getType().getSize() > e2.getType().getSize() and
+    mexp.getConversion().getConversion().getType().getSize() > e1.getType().getSize() and
+    exists(Expr e0 |
+      e0.(AssignExpr).getRValue() = mexp.getParent*() and
+      e0.(AssignExpr).getLValue().getType().getSize() =
+        mexp.getConversion().getConversion().getType().getSize()
+      or
+      mexp.getEnclosingElement().(ComparisonOperation).hasOperands(mexp, e0) and
+      e0.getType().getSize() = mexp.getConversion().getConversion().getType().getSize()
+      or
+      e0.(FunctionCall)
+          .getTarget()
+          .getParameter(argumentPosition(e0.(FunctionCall), mexp, _))
+          .getType()
+          .getSize() = mexp.getConversion().getConversion().getType().getSize()
+    )
+  )
+}
+
+/** Holds if the situation of a possible signed overflow used in pointer arithmetic is found. */
+predicate signSmallerWithEqualSizes(MulExpr mexp) {
+  exists(Expr e1, Expr e2 |
+    mexp.hasOperands(e1, e2) and
+    not e1.isConstant() and
+    not e1.hasConversion() and
+    not e1.hasConversion() and
+    (
+      e2.isConstant() or
+      not e2.hasConversion()
+    ) and
+    mexp.getConversion+().getUnderlyingType().getSize() = e1.getUnderlyingType().getSize() and
+    (
+      e2.isConstant() or
+      mexp.getConversion+().getUnderlyingType().getSize() = e2.getUnderlyingType().getSize()
+    ) and
+    mexp.getConversion+().getUnderlyingType().getSize() = e1.getUnderlyingType().getSize() and
+    exists(AssignExpr ae |
+      ae.getRValue() = mexp.getParent*() and
+      ae.getRValue().getUnderlyingType().(IntegralType).isUnsigned() and
+      ae.getLValue().getUnderlyingType().(IntegralType).isSigned() and
+      (
+        not exists(DivExpr de | mexp.getParent*() = de)
+        or
+        exists(DivExpr de, Expr ec |
+          e2.isConstant() and
+          de.hasOperands(mexp.getParent*(), ec) and
+          ec.isConstant() and
+          e2.getValue().toInt() > ec.getValue().toInt()
+        )
+      ) and
+      exists(PointerAddExpr pa |
+        ae.getASuccessor+() = pa and
+        pa.getAnOperand().(VariableAccess).getTarget() = ae.getLValue().(VariableAccess).getTarget()
+      )
+    )
+  )
+}
+
+from MulExpr mexp, string msg
+where
+  conversionDoneLate(mexp) and
+  msg = "This transformation is applied after multiplication."
+  or
+  signSmallerWithEqualSizes(mexp) and
+  msg = "Possible signed overflow followed by offset of the pointer out of bounds."
+select mexp, msg
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.cpp b/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.cpp
new file mode 100644
index 00000000000..4e29879a94d
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.cpp
@@ -0,0 +1,10 @@
+...
+  FILE *fp = fopen(filename,"w"); // BAD
+...
+  umask(S_IXUSR|S_IRWXG|S_IRWXO);
+  FILE *fp;
+  fp = fopen(filename,"w"); // GOOD
+  chmod(filename,S_IRUSR|S_IWUSR);
+  fprintf(fp,"%s\n","data to file");
+  fclose(fp);
+...
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.qhelp b/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.qhelp
new file mode 100644
index 00000000000..e46dd08f57e
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.qhelp
@@ -0,0 +1,24 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>When creating a file using a library function such as <code>fopen</code>, the access rights for the newly created file are not specified as part of the call. Instead these rights are determined by the system unless the programmer takes specific measures, such as calling the Posix <code>umask</code> function at some point before the call to <code>fopen</code>. For some applications, the default access rights assigned by the system are not sufficient to protect a file against access by an attacker.</p>
+
+
+</overview>
+
+<example>
+<p>The following example demonstrates erroneous and fixed methods for working with files.</p>
+<sample src="ExposureSensitiveInformationUnauthorizedActor.cpp" />
+
+</example>
+<references>
+
+<li>
+  CERT C Coding Standard:
+  <a href="https://wiki.sei.cmu.edu/confluence/display/c/FIO06-C.+Create+files+with+appropriate+access+permissions">FIO06-C. Create files with appropriate access permissions</a>.
+</li>
+
+</references>
+</qhelp>
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.ql b/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.ql
new file mode 100644
index 00000000000..ec32ccd4bfc
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.ql
@@ -0,0 +1,65 @@
+/**
+ * @name Writing to a file without setting permissions.
+ * @description Lack of restriction on file access rights can be unsafe.
+ * @kind problem
+ * @id cpp/work-with-file-without-permissions-rights
+ * @problem.severity warning
+ * @precision medium
+ * @tags correctness
+ *       maintainability
+ *       security
+ *       external/cwe/cwe-200
+ *       external/cwe/cwe-264
+ */
+
+import cpp
+import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+
+/** Holds for a function `f` that has an argument at index `apos` used to read the file. */
+predicate numberArgumentRead(Function f, int apos) {
+  f.hasGlobalOrStdName("fgets") and apos = 2
+  or
+  f.hasGlobalOrStdName("fread") and apos = 3
+  or
+  f.hasGlobalOrStdName("read") and apos = 0
+  or
+  f.hasGlobalOrStdName("fscanf") and apos = 0
+}
+
+/** Holds for a function `f` that has an argument at index `apos` used to write to file */
+predicate numberArgumentWrite(Function f, int apos) {
+  f.hasGlobalOrStdName("fprintf") and apos = 0
+  or
+  f.hasGlobalOrStdName("fputs") and apos = 1
+  or
+  f.hasGlobalOrStdName("write") and apos = 0
+  or
+  f.hasGlobalOrStdName("fwrite") and apos = 3
+  or
+  f.hasGlobalOrStdName("fflush") and apos = 0
+}
+
+from FunctionCall fc
+where
+  // a file is opened
+  (
+    fc.getTarget().hasGlobalOrStdName("fopen") or
+    fc.getTarget().hasGlobalOrStdName("open")
+  ) and
+  fc.getNumberOfArguments() = 2 and
+  // the file is used for writing (but not reading)
+  exists(FunctionCall fctmp, int i |
+    numberArgumentWrite(fctmp.getTarget(), i) and
+    globalValueNumber(fc) = globalValueNumber(fctmp.getArgument(i))
+  ) and
+  not exists(FunctionCall fctmp, int i |
+    numberArgumentRead(fctmp.getTarget(), i) and
+    globalValueNumber(fc) = globalValueNumber(fctmp.getArgument(i))
+  ) and
+  // a file creation mode is not set globally by `umask` anywhere in the program
+  not exists(FunctionCall fctmp |
+    fctmp.getTarget().hasGlobalOrStdName("umask") or
+    fctmp.getTarget().hasGlobalOrStdName("fchmod") or
+    fctmp.getTarget().hasGlobalOrStdName("chmod")
+  )
+select fc, "You may have forgotten to restrict access rights when working with a file."
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-377/InsecureTemporaryFile.ql b/cpp/ql/src/experimental/Security/CWE/CWE-377/InsecureTemporaryFile.ql
index 877b67cbbf8..0852cb90918 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-377/InsecureTemporaryFile.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-377/InsecureTemporaryFile.ql
@@ -13,30 +13,6 @@
 import cpp
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
-/** Holds for a function `f` that has an argument at index `apos` used to read the file. */
-predicate numberArgumentRead(Function f, int apos) {
-  f.hasGlobalOrStdName("fgets") and apos = 2
-  or
-  f.hasGlobalOrStdName("fread") and apos = 3
-  or
-  f.hasGlobalOrStdName("read") and apos = 0
-  or
-  f.hasGlobalOrStdName("fscanf") and apos = 0
-}
-
-/** Holds for a function `f` that has an argument at index `apos` used to write to file */
-predicate numberArgumentWrite(Function f, int apos) {
-  f.hasGlobalOrStdName("fprintf") and apos = 0
-  or
-  f.hasGlobalOrStdName("fputs") and apos = 1
-  or
-  f.hasGlobalOrStdName("write") and apos = 0
-  or
-  f.hasGlobalOrStdName("fwrite") and apos = 3
-  or
-  f.hasGlobalOrStdName("fflush") and apos = 0
-}
-
 from FunctionCall fc, string msg
 where
   // search for functions for generating a name, without a guarantee of the absence of a file during the period of work with it.
@@ -59,54 +35,4 @@ where
   ) and
   msg =
     "Finding the name of a file that does not exist does not mean that it will not be exist at the next operation."
-  or
-  // finding places to work with a file without setting permissions, but with predictable names.
-  (
-    fc.getTarget().hasGlobalOrStdName("fopen") or
-    fc.getTarget().hasGlobalOrStdName("open")
-  ) and
-  fc.getNumberOfArguments() = 2 and
-  exists(FunctionCall fctmp, int i |
-    numberArgumentWrite(fctmp.getTarget(), i) and
-    globalValueNumber(fc) = globalValueNumber(fctmp.getArgument(i))
-  ) and
-  not exists(FunctionCall fctmp, int i |
-    numberArgumentRead(fctmp.getTarget(), i) and
-    globalValueNumber(fc) = globalValueNumber(fctmp.getArgument(i))
-  ) and
-  exists(FunctionCall fctmp |
-    (
-      fctmp.getTarget().hasGlobalOrStdName("strcat") or
-      fctmp.getTarget().hasGlobalOrStdName("strcpy")
-    ) and
-    globalValueNumber(fc.getArgument(0)) = globalValueNumber(fctmp.getAnArgument())
-    or
-    fctmp.getTarget().hasGlobalOrStdName("getenv") and
-    globalValueNumber(fc.getArgument(0)) = globalValueNumber(fctmp)
-    or
-    (
-      fctmp.getTarget().hasGlobalOrStdName("asprintf") or
-      fctmp.getTarget().hasGlobalOrStdName("vasprintf") or
-      fctmp.getTarget().hasGlobalOrStdName("xasprintf") or
-      fctmp.getTarget().hasGlobalOrStdName("xvasprintf ")
-    ) and
-    exists(Variable vrtmp |
-      vrtmp = fc.getArgument(0).(VariableAccess).getTarget() and
-      vrtmp = fctmp.getArgument(0).(AddressOfExpr).getAddressable() and
-      not vrtmp instanceof Field
-    )
-  ) and
-  not exists(FunctionCall fctmp |
-    (
-      fctmp.getTarget().hasGlobalOrStdName("umask") or
-      fctmp.getTarget().hasGlobalOrStdName("fchmod") or
-      fctmp.getTarget().hasGlobalOrStdName("chmod")
-    ) and
-    (
-      fc.getBasicBlock().getASuccessor*() = fctmp.getBasicBlock() or
-      fctmp.getBasicBlock().getASuccessor*() = fc.getBasicBlock()
-    )
-  ) and
-  msg =
-    "Creating a file for writing without evaluating its existence and setting permissions can be unsafe."
 select fc, msg
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.cpp b/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.cpp
new file mode 100644
index 00000000000..4928db37a17
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.cpp
@@ -0,0 +1,10 @@
+...
+  r = scanf("%i", &i);
+  if (r == 1) // GOOD
+    return i;
+  else
+    return -1;
+...
+  scanf("%i", &i); // BAD
+  return i;
+...
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.qhelp b/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.qhelp
new file mode 100644
index 00000000000..ab40910f5d3
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.qhelp
@@ -0,0 +1,27 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>The `scanf` family functions does not require the memory pointed to by its additional pointer arguments to be initialized before calling. The user is required to check the return value of `scanf` and similar functions to establish how many of the additional arguments were assigned values. Not checking the return value and reading one of the arguments not assigned a value is undefined behavior and may have unexpected consequences.</p>
+</overview>
+
+<recommendation>
+<p>
+The user should check the return value of `scanf` and related functions and check that any additional argument was assigned a value before reading the additional argument.
+</p>
+</recommendation>
+<example>
+<p>The first first example below is correct, as value of `i` is only read once it is checked that `scanf` has read one item. The second example is incorrect, as the return value of `scanf` is not checked, and as `scanf` might have failed to read any item before returning.</p>
+<sample src="ImproperCheckReturnValueScanf.cpp" />
+
+</example>
+<references>
+
+<li>
+  CERT C Coding Standard:
+  <a href="https://wiki.sei.cmu.edu/confluence/display/c/EXP12-C.+Do+not+ignore+values+returned+by+functions">EXP12-C. Do not ignore values returned by functions</a>.
+</li>
+
+</references>
+</qhelp>
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.ql b/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.ql
new file mode 100644
index 00000000000..5f296752c1c
--- /dev/null
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.ql
@@ -0,0 +1,103 @@
+/**
+ * @name Improper check of return value of scanf
+ * @description Not checking the return value of scanf and related functions may lead to undefined behavior.
+ * @kind problem
+ * @id cpp/improper-check-return-value-scanf
+ * @problem.severity warning
+ * @precision medium
+ * @tags correctness
+ *       security
+ *       external/cwe/cwe-754
+ *       external/cwe/cwe-908
+ */
+
+import cpp
+import semmle.code.cpp.commons.Exclusions
+
+/** Returns the position of the first argument being filled. */
+int posArgumentInFunctionCall(FunctionCall fc) {
+  (
+    fc.getTarget().hasGlobalOrStdName(["scanf", "scanf_s"]) and
+    result = 1
+    or
+    fc.getTarget().hasGlobalOrStdName(["fscanf", "sscanf", "fscanf_s", "sscanf_s"]) and
+    result = 2
+  )
+}
+
+/** Holds if a function argument was not initialized but used after the call. */
+predicate argumentIsNotInitializedAndIsUsed(Variable vt, FunctionCall fc) {
+  // Fillable argument was not initialized.
+  vt instanceof LocalScopeVariable and
+  not vt.getAnAssignment().getASuccessor+() = fc and
+  (
+    not vt.hasInitializer()
+    or
+    exists(Expr e, Variable v |
+      e = vt.getInitializer().getExpr() and
+      v = e.(AddressOfExpr).getOperand().(VariableAccess).getTarget() and
+      (
+        not v.hasInitializer() and
+        not v.getAnAssignment().getASuccessor+() = fc
+      )
+    )
+  ) and
+  not exists(AssignExpr ae |
+    ae.getLValue() = vt.getAnAccess().getParent() and
+    ae.getASuccessor+() = fc
+  ) and
+  not exists(FunctionCall f0 |
+    f0.getAnArgument().getAChild() = vt.getAnAccess() and
+    f0.getASuccessor+() = fc
+  ) and
+  exists(Expr e0 |
+    // After the call, the completed arguments are assigned or returned as the result of the operation of the upper function.
+    fc.getASuccessor+() = e0 and
+    (
+      (
+        e0.(Assignment).getRValue().(VariableAccess).getTarget() = vt or
+        e0.(Assignment).getRValue().(ArrayExpr).getArrayBase().(VariableAccess).getTarget() = vt
+      )
+      or
+      e0.getEnclosingStmt() instanceof ReturnStmt and
+      e0.(VariableAccess).getTarget() = vt
+      or
+      not exists(Expr e1 |
+        fc.getASuccessor+() = e1 and
+        e1.(VariableAccess).getTarget() = vt
+      )
+    )
+  )
+}
+
+from FunctionCall fc, int i
+where
+  // Function return value is not evaluated.
+  fc instanceof ExprInVoidContext and
+  not isFromMacroDefinition(fc) and
+  i in [posArgumentInFunctionCall(fc) .. fc.getNumberOfArguments() - 1] and
+  (
+    argumentIsNotInitializedAndIsUsed(fc.getArgument(i).(VariableAccess).getTarget(), fc) or
+    argumentIsNotInitializedAndIsUsed(fc.getArgument(i)
+          .(AddressOfExpr)
+          .getOperand()
+          .(VariableAccess)
+          .getTarget(), fc) or
+    argumentIsNotInitializedAndIsUsed(fc.getArgument(i)
+          .(ArrayExpr)
+          .getArrayBase()
+          .(VariableAccess)
+          .getTarget(), fc)
+  ) and
+  // After the call, filled arguments are not evaluated.
+  not exists(Expr e0, int i1 |
+    i1 in [posArgumentInFunctionCall(fc) .. fc.getNumberOfArguments() - 1] and
+    fc.getASuccessor+() = e0 and
+    e0.getEnclosingElement() instanceof ComparisonOperation and
+    (
+      e0.(VariableAccess).getTarget() = fc.getArgument(i1).(VariableAccess).getTarget() or
+      e0.(VariableAccess).getTarget() =
+        fc.getArgument(i1).(AddressOfExpr).getOperand().(VariableAccess).getTarget()
+    )
+  )
+select fc, "Unchecked return value for call to '" + fc.getTarget().getName() + "'."
diff --git a/cpp/ql/src/external/CodeDuplication.qll b/cpp/ql/src/external/CodeDuplication.qll
index 26fe883fc2f..e50323f7087 100644
--- a/cpp/ql/src/external/CodeDuplication.qll
+++ b/cpp/ql/src/external/CodeDuplication.qll
@@ -2,14 +2,14 @@
 
 import cpp
 
-private newtype TDuplicationOrSimilarity = MKDuplicationOrSimilarity()
+deprecated private newtype TDuplicationOrSimilarity = MKDuplicationOrSimilarity()
 
 /**
  * DEPRECATED: This class is no longer used.
  *
  * A token block used for detection of duplicate and similar code.
  */
-class Copy extends TDuplicationOrSimilarity {
+deprecated class Copy extends TDuplicationOrSimilarity {
   /** Gets the index of the token in this block starting at the location `loc`, if any. */
   int tokenStartingAt(Location loc) { none() }
 
@@ -63,7 +63,7 @@ class Copy extends TDuplicationOrSimilarity {
  *
  * A block of duplicated code.
  */
-class DuplicateBlock extends Copy {
+deprecated class DuplicateBlock extends Copy {
   override string toString() {
     result = "Duplicate code: " + this.sourceLines() + " duplicated lines."
   }
@@ -74,21 +74,29 @@ class DuplicateBlock extends Copy {
  *
  * A block of similar code.
  */
-class SimilarBlock extends Copy {
+deprecated class SimilarBlock extends Copy {
   override string toString() {
     result = "Similar code: " + this.sourceLines() + " almost duplicated lines."
   }
 }
 
-/** Gets a function with a body and a location. */
-FunctionDeclarationEntry sourceMethod() {
+/**
+ * DEPRECATED: The `CodeDuplication` library will be removed in a future release.
+ *
+ * Gets a function with a body and a location.
+ */
+deprecated FunctionDeclarationEntry sourceMethod() {
   result.isDefinition() and
   exists(result.getLocation()) and
   numlines(unresolveElement(result.getFunction()), _, _, _)
 }
 
-/** Gets the number of member functions in `c` with a body and a location. */
-int numberOfSourceMethods(Class c) {
+/**
+ * DEPRECATED: The `CodeDuplication` library will be removed in a future release.
+ *
+ * Gets the number of member functions in `c` with a body and a location.
+ */
+deprecated int numberOfSourceMethods(Class c) {
   result =
     count(FunctionDeclarationEntry m |
       m = sourceMethod() and
@@ -96,7 +104,7 @@ int numberOfSourceMethods(Class c) {
     )
 }
 
-private predicate blockCoversStatement(int equivClass, int first, int last, Stmt stmt) {
+deprecated private predicate blockCoversStatement(int equivClass, int first, int last, Stmt stmt) {
   exists(DuplicateBlock b, Location loc |
     stmt.getLocation() = loc and
     first = b.tokenStartingAt(loc) and
@@ -105,13 +113,13 @@ private predicate blockCoversStatement(int equivClass, int first, int last, Stmt
   )
 }
 
-private Stmt statementInMethod(FunctionDeclarationEntry m) {
+deprecated private Stmt statementInMethod(FunctionDeclarationEntry m) {
   result.getParent+() = m.getBlock() and
   not result.getLocation() instanceof UnknownStmtLocation and
   not result instanceof BlockStmt
 }
 
-private predicate duplicateStatement(
+deprecated private predicate duplicateStatement(
   FunctionDeclarationEntry m1, FunctionDeclarationEntry m2, Stmt s1, Stmt s2
 ) {
   exists(int equivClass, int first, int last |
@@ -125,31 +133,39 @@ private predicate duplicateStatement(
 }
 
 /**
+ * DEPRECATED: Information on duplicated statements is no longer available.
+ *
  * Holds if `m1` is a function with `total` lines, and `m2` is a function
  * that has `duplicate` lines in common with `m1`.
  */
-predicate duplicateStatements(
+deprecated predicate duplicateStatements(
   FunctionDeclarationEntry m1, FunctionDeclarationEntry m2, int duplicate, int total
 ) {
   duplicate = strictcount(Stmt s | duplicateStatement(m1, m2, s, _)) and
   total = strictcount(statementInMethod(m1))
 }
 
-/** Holds if `m` and other are identical functions. */
-predicate duplicateMethod(FunctionDeclarationEntry m, FunctionDeclarationEntry other) {
+/**
+ * DEPRECATED: Information on duplicated methods is no longer available.
+ *
+ *  Holds if `m` and other are identical functions.
+ */
+deprecated predicate duplicateMethod(FunctionDeclarationEntry m, FunctionDeclarationEntry other) {
   exists(int total | duplicateStatements(m, other, total, total))
 }
 
 /**
+ * DEPRECATED: Information on similar lines is no longer available.
+ *
  * INTERNAL: do not use.
  *
  * Holds if `line` in `f` is similar to a line somewhere else.
  */
-predicate similarLines(File f, int line) {
+deprecated predicate similarLines(File f, int line) {
   exists(SimilarBlock b | b.sourceFile() = f and line in [b.sourceStartLine() .. b.sourceEndLine()])
 }
 
-private predicate similarLinesPerEquivalenceClass(int equivClass, int lines, File f) {
+deprecated private predicate similarLinesPerEquivalenceClass(int equivClass, int lines, File f) {
   lines =
     strictsum(SimilarBlock b, int toSum |
       (b.sourceFile() = f and b.getEquivalenceClass() = equivClass) and
@@ -159,7 +175,7 @@ private predicate similarLinesPerEquivalenceClass(int equivClass, int lines, Fil
     )
 }
 
-private predicate similarLinesCoveredFiles(File f, File otherFile) {
+deprecated private predicate similarLinesCoveredFiles(File f, File otherFile) {
   exists(int numLines | numLines = f.getMetrics().getNumberOfLines() |
     exists(int coveredApprox |
       coveredApprox =
@@ -175,8 +191,12 @@ private predicate similarLinesCoveredFiles(File f, File otherFile) {
   )
 }
 
-/** Holds if `coveredLines` lines of `f` are similar to lines in `otherFile`. */
-predicate similarLinesCovered(File f, int coveredLines, File otherFile) {
+/**
+ * DEPRECATED: Information on similar lines is no longer available.
+ *
+ * Holds if `coveredLines` lines of `f` are similar to lines in `otherFile`.
+ */
+deprecated predicate similarLinesCovered(File f, int coveredLines, File otherFile) {
   exists(int numLines | numLines = f.getMetrics().getNumberOfLines() |
     similarLinesCoveredFiles(f, otherFile) and
     exists(int notCovered |
@@ -191,17 +211,19 @@ predicate similarLinesCovered(File f, int coveredLines, File otherFile) {
 }
 
 /**
+ * DEPRECATED: Information on duplicate lines is no longer available.
+ *
  * INTERNAL: do not use.
  *
  * Holds if `line` in `f` is duplicated by a line somewhere else.
  */
-predicate duplicateLines(File f, int line) {
+deprecated predicate duplicateLines(File f, int line) {
   exists(DuplicateBlock b |
     b.sourceFile() = f and line in [b.sourceStartLine() .. b.sourceEndLine()]
   )
 }
 
-private predicate duplicateLinesPerEquivalenceClass(int equivClass, int lines, File f) {
+deprecated private predicate duplicateLinesPerEquivalenceClass(int equivClass, int lines, File f) {
   lines =
     strictsum(DuplicateBlock b, int toSum |
       (b.sourceFile() = f and b.getEquivalenceClass() = equivClass) and
@@ -211,8 +233,12 @@ private predicate duplicateLinesPerEquivalenceClass(int equivClass, int lines, F
     )
 }
 
-/** Holds if `coveredLines` lines of `f` are duplicates of lines in `otherFile`. */
-predicate duplicateLinesCovered(File f, int coveredLines, File otherFile) {
+/**
+ * DEPRECATED: Information on duplicate lines is no longer available.
+ *
+ *  Holds if `coveredLines` lines of `f` are duplicates of lines in `otherFile`.
+ */
+deprecated predicate duplicateLinesCovered(File f, int coveredLines, File otherFile) {
   exists(int numLines | numLines = f.getMetrics().getNumberOfLines() |
     exists(int coveredApprox |
       coveredApprox =
@@ -236,8 +262,12 @@ predicate duplicateLinesCovered(File f, int coveredLines, File otherFile) {
   )
 }
 
-/** Holds if most of `f` (`percent`%) is similar to `other`. */
-predicate similarFiles(File f, File other, int percent) {
+/**
+ * DEPRECATED: Information on similar files is no longer available.
+ *
+ * Holds if most of `f` (`percent`%) is similar to `other`.
+ */
+deprecated predicate similarFiles(File f, File other, int percent) {
   exists(int covered, int total |
     similarLinesCovered(f, covered, other) and
     total = f.getMetrics().getNumberOfLines() and
@@ -247,8 +277,12 @@ predicate similarFiles(File f, File other, int percent) {
   not duplicateFiles(f, other, _)
 }
 
-/** Holds if most of `f` (`percent`%) is duplicated by `other`. */
-predicate duplicateFiles(File f, File other, int percent) {
+/**
+ * DEPRECATED: Information on duplicate files is no longer available.
+ *
+ *  Holds if most of `f` (`percent`%) is duplicated by `other`.
+ */
+deprecated predicate duplicateFiles(File f, File other, int percent) {
   exists(int covered, int total |
     duplicateLinesCovered(f, covered, other) and
     total = f.getMetrics().getNumberOfLines() and
@@ -258,10 +292,12 @@ predicate duplicateFiles(File f, File other, int percent) {
 }
 
 /**
+ * DEPRECATED: Information on duplciate classes is no longer available.
+ *
  * Holds if most member functions of `c` (`numDup` out of `total`) are
  * duplicates of member functions in `other`.
  */
-predicate mostlyDuplicateClassBase(Class c, Class other, int numDup, int total) {
+deprecated predicate mostlyDuplicateClassBase(Class c, Class other, int numDup, int total) {
   numDup =
     strictcount(FunctionDeclarationEntry m1 |
       exists(FunctionDeclarationEntry m2 |
@@ -277,11 +313,13 @@ predicate mostlyDuplicateClassBase(Class c, Class other, int numDup, int total)
 }
 
 /**
+ * DEPRECATED: Information on duplciate classes is no longer available.
+ *
  * Holds if most member functions of `c` are duplicates of member functions in
  * `other`. Provides the human-readable `message` to describe the amount of
  * duplication.
  */
-predicate mostlyDuplicateClass(Class c, Class other, string message) {
+deprecated predicate mostlyDuplicateClass(Class c, Class other, string message) {
   exists(int numDup, int total |
     mostlyDuplicateClassBase(c, other, numDup, total) and
     (
@@ -305,21 +343,31 @@ predicate mostlyDuplicateClass(Class c, Class other, string message) {
   )
 }
 
-/** Holds if `f` and `other` are similar or duplicates. */
-predicate fileLevelDuplication(File f, File other) {
+/**
+ * DEPRECATED: Information on file duplication is no longer available.
+ *
+ * Holds if `f` and `other` are similar or duplicates.
+ */
+deprecated predicate fileLevelDuplication(File f, File other) {
   similarFiles(f, other, _) or duplicateFiles(f, other, _)
 }
 
 /**
+ * DEPRECATED: Information on class duplication is no longer available.
+ *
  * Holds if most member functions of `c` are duplicates of member functions in
  * `other`.
  */
-predicate classLevelDuplication(Class c, Class other) { mostlyDuplicateClass(c, other, _) }
+deprecated predicate classLevelDuplication(Class c, Class other) {
+  mostlyDuplicateClass(c, other, _)
+}
 
 /**
+ * DEPRECATED: The CodeDuplication library will be removed in a future release.
+ *
  * Holds if `line` in `f` should be allowed to be duplicated. This is the case
  * for `#include` directives.
  */
-predicate whitelistedLineForDuplication(File f, int line) {
+deprecated predicate whitelistedLineForDuplication(File f, int line) {
   exists(Include i | i.getFile() = f and i.getLocation().getStartLine() = line)
 }
diff --git a/cpp/ql/src/external/DuplicateBlock.ql b/cpp/ql/src/external/DuplicateBlock.ql
deleted file mode 100644
index 3fdef9b510d..00000000000
--- a/cpp/ql/src/external/DuplicateBlock.ql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @deprecated
- * @name Duplicate code
- * @description This block of code is duplicated elsewhere. If possible, the shared code should be refactored so there is only one occurrence left. It may not always be possible to address these issues; other duplicate code checks (such as duplicate function, duplicate class) give subsets of the results with higher confidence.
- * @kind problem
- * @id cpp/duplicate-block
- * @problem.severity recommendation
- * @precision medium
- * @tags testability
- *       maintainability
- *       duplicate-code
- *       non-attributable
- */
-
-import CodeDuplication
-
-from DuplicateBlock d, DuplicateBlock other, int lines, File otherFile, int otherLine
-where
-  lines = d.sourceLines() and
-  lines > 10 and
-  other.getEquivalenceClass() = d.getEquivalenceClass() and
-  other != d and
-  otherFile = other.sourceFile() and
-  otherLine = other.sourceStartLine()
-select d,
-  "Duplicate code: " + lines + " lines are duplicated at " + otherFile.getBaseName() + ":" +
-    otherLine
diff --git a/cpp/ql/src/external/DuplicateFunction.qhelp b/cpp/ql/src/external/DuplicateFunction.qhelp
deleted file mode 100644
index 8e81c11e5e6..00000000000
--- a/cpp/ql/src/external/DuplicateFunction.qhelp
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>A function should never be duplicated verbatim in several places in the code. Of course
-the severity of this anti-pattern is higher for longer functions than for extremely short
-functions of one or two statements, but there are usually better ways of achieving the same
-effect.</p>
-
-</overview>
-<recommendation>
-<p>Code duplication in general is highly undesirable for a range of reasons: The artificially
-inflated amount of code hinders comprehension, and ranges of similar but subtly different lines
-can mask the real purpose or intention behind a function. There is also a risk of
-update anomalies, where only one of several copies of the code is updated to address a defect or
-add a feature.</p>
-
-<p>In the case of function duplication, how to address the issue depends on the functions themselves
-and on the precise classes in which the duplication occurs. At its simplest, the duplication can
-be addressed by removing all but one of the duplicate function definitions and making
-callers of the removed functions refer to the (now canonical) single remaining definition
-instead.</p>
-
-<p>This may not be possible for reasons of visibility or accessibility. A common example might
-be where two classes implement the same functionality but neither is a subtype of the other,
-so it is not possible to inherit a single function definition. In such cases, introducing a
-common superclass to share the duplicated code is a viable option. Alternatively, if the functions
-don't need access to private object state, they can be moved to a shared utility class that
-just provides the functionality itself.</p>
-
-</recommendation>
-<references>
-
-<li>Elmar Juergens, Florian Deissenboeck, Benjamin Hummel, and Stefan Wagner. 2009. 
-Do code clones matter?  In <em>Proceedings of the 31st International Conference on
-Software Engineering</em> (ICSE '09). IEEE Computer Society, Washington, DC, USA, 
-485-495.</li>
-
-</references>
-</qhelp>
diff --git a/cpp/ql/src/external/DuplicateFunction.ql b/cpp/ql/src/external/DuplicateFunction.ql
deleted file mode 100644
index 1a861867fcb..00000000000
--- a/cpp/ql/src/external/DuplicateFunction.ql
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @deprecated
- * @name Duplicate function
- * @description There is another identical implementation of this function. Extract the code to a common file or superclass or delegate to improve sharing.
- * @kind problem
- * @id cpp/duplicate-function
- * @problem.severity recommendation
- * @precision medium
- * @tags testability
- *       maintainability
- *       duplicate-code
- *       non-attributable
- */
-
-import cpp
-import CodeDuplication
-
-predicate relevant(FunctionDeclarationEntry m) {
-  exists(Location loc |
-    loc = m.getBlock().getLocation() and
-    (
-      loc.getStartLine() + 5 < loc.getEndLine() and not m.getName().matches("get%")
-      or
-      loc.getStartLine() + 10 < loc.getEndLine()
-    )
-  )
-}
-
-from FunctionDeclarationEntry m, FunctionDeclarationEntry other
-where
-  duplicateMethod(m, other) and
-  relevant(m) and
-  not m.getFunction().isConstructedFrom(_) and
-  not other.getFunction().isConstructedFrom(_) and
-  not fileLevelDuplication(m.getFile(), other.getFile()) and
-  not classLevelDuplication(m.getFunction().getDeclaringType(),
-    other.getFunction().getDeclaringType())
-select m, "Function " + m.getName() + " is duplicated at $@.", other,
-  other.getFile().getBaseName() + ":" + other.getLocation().getStartLine().toString()
diff --git a/cpp/ql/src/external/MostlyDuplicateClass.qhelp b/cpp/ql/src/external/MostlyDuplicateClass.qhelp
deleted file mode 100644
index 113eb6bf243..00000000000
--- a/cpp/ql/src/external/MostlyDuplicateClass.qhelp
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>In cases where several methods are duplicated between two (or more) classes,
-the classes themselves are highlighted as "mostly duplicate", rather than creating a large
-number of method-level warnings. The same caveats apply here, too.</p>
-
-</overview>
-<recommendation>
-<p>Code duplication in general is highly undesirable for a range of reasons: The artificially
-inflated amount of code hinders comprehension, and ranges of similar but subtly different lines
-can mask the real purpose or intention behind a method. There's also an omnipresent risk of
-update anomalies, where only one of several copies of the code is updated to address a defect or
-add a feature.</p>
-
-<p>While completely duplicated classes are rare, they are usually a sign of a simple
-oversight (or deliberate copy/paste) on a developer's part. Usually the required remedy
-action is to remove all but one of them.</p>
-
-<p>It is far more common to see duplication of many methods between two classes, leaving just
-a few that are actually different. Such situations warrant close inspection. Are the differences
-deliberate or a result of an inconsistent update to one of the clones? If the latter, then
-treating the classes as completely duplicate and eliminating all but one (while preserving any
-corrections or new features that may have been introduced) is the best course. If two classes serve
-genuinely different purposes but almost all of their methods are the same, that can be a sign
-that there is a missing level of abstraction. Introducing a common superclass to define the
-common methods and sharing the code is likely to prevent many problems in the long term.</p>
-
-<p>Modern IDEs may provide refactoring support for this sort of transformation, usually
-under the names of "Pull up" or "Extract supertype".</p>
-
-</recommendation>
-<references>
-
-<li>Elmar Juergens, Florian Deissenboeck, Benjamin Hummel, and Stefan Wagner. 2009. 
-Do code clones matter?  In <em>Proceedings of the 31st International Conference on
-Software Engineering</em> (ICSE '09). IEEE Computer Society, Washington, DC, USA, 
-485-495.</li>
-
-</references>
-</qhelp>
diff --git a/cpp/ql/src/external/MostlyDuplicateClass.ql b/cpp/ql/src/external/MostlyDuplicateClass.ql
deleted file mode 100644
index 20b9f39214e..00000000000
--- a/cpp/ql/src/external/MostlyDuplicateClass.ql
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @deprecated
- * @name Mostly duplicate class
- * @description More than 80% of the methods in this class are duplicated in another class. Create a common supertype to improve code sharing.
- * @kind problem
- * @id cpp/duplicate-class
- * @problem.severity recommendation
- * @precision medium
- * @tags testability
- *       maintainability
- *       duplicate-code
- *       non-attributable
- */
-
-import cpp
-import CodeDuplication
-
-from Class c, Class other, string message
-where
-  mostlyDuplicateClass(c, other, message) and
-  not c.isConstructedFrom(_) and
-  not other.isConstructedFrom(_) and
-  not fileLevelDuplication(c.getFile(), _)
-select c, message, other, other.getQualifiedName()
diff --git a/cpp/ql/src/external/MostlyDuplicateFile.qhelp b/cpp/ql/src/external/MostlyDuplicateFile.qhelp
deleted file mode 100644
index b3b319f346b..00000000000
--- a/cpp/ql/src/external/MostlyDuplicateFile.qhelp
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>In cases where most of a file's lines have been duplicated in one or more other
-files, the files themselves are highlighted as "mostly duplicate", rather than
-creating a large number of method-level or class-level warnings. The same caveats
-apply here, too.</p>
-
-</overview>
-<recommendation>
-<p>Code duplication in general is highly undesirable for a range of reasons: The artificially
-inflated amount of code hinders comprehension, and ranges of similar but subtly different lines
-can mask the real purpose or intention behind a method. There's also an omnipresent risk of
-update anomalies, where only one of several copies of the code is updated to address a defect or
-add a feature.</p>
-
-<p>While completely duplicated files are rare, they are usually a sign of a simple
-oversight (or deliberate copy/paste) on a developer's part. Usually the required remedy
-action is to remove all but one of them. A common exception may arise from generated code
-that simply occurs in several places in the source tree; the check can be adapted to
-exclude such results.</p>
-
-<p>It is far more common to see duplication of many lines between two files, leaving just
-a few that are actually different. Such situations warrant close inspection. Are the differences
-deliberate or a result of an inconsistent update to one of the clones? If the latter, then
-treating the files as completely duplicate and eliminating all but one (while preserving any
-corrections or new features that may have been introduced) is the best course. If two files serve
-genuinely different purposes but almost all of their lines are the same, that can be a sign
-that there is a missing level of abstraction. Look for ways to share the functionality, either
-by extracting a utility class for parts of it or by encapsulating the common parts into a new
-super class of any classes involved.</p>
-
-</recommendation>
-<references>
-
-<li>Elmar Juergens, Florian Deissenboeck, Benjamin Hummel, and Stefan Wagner. 2009. 
-Do code clones matter?  In <em>Proceedings of the 31st International Conference on
-Software Engineering</em> (ICSE '09). IEEE Computer Society, Washington, DC, USA, 
-485-495.</li>
-
-</references>
-</qhelp>
diff --git a/cpp/ql/src/external/MostlyDuplicateFile.ql b/cpp/ql/src/external/MostlyDuplicateFile.ql
deleted file mode 100644
index 8cb23a432d2..00000000000
--- a/cpp/ql/src/external/MostlyDuplicateFile.ql
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @deprecated
- * @name Mostly duplicate file
- * @description There is another file that shares a lot of the code with this file. Merge the two files to improve maintainability.
- * @kind problem
- * @id cpp/duplicate-file
- * @problem.severity recommendation
- * @precision medium
- * @tags testability
- *       maintainability
- *       duplicate-code
- *       non-attributable
- */
-
-import cpp
-import CodeDuplication
-
-from File f, File other, int percent
-where duplicateFiles(f, other, percent)
-select f, percent + "% of the lines in " + f.getBaseName() + " are copies of lines in $@.", other,
-  other.getBaseName()
diff --git a/cpp/ql/src/external/MostlyDuplicateFunction.qhelp b/cpp/ql/src/external/MostlyDuplicateFunction.qhelp
deleted file mode 100644
index a981eef6e87..00000000000
--- a/cpp/ql/src/external/MostlyDuplicateFunction.qhelp
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>A "mostly duplicate function" is a function for which there is at least one
-almost exact duplicate somewhere else in the code, but for which there are no
-exact duplicates. There will be minor typographical differences between this
-function and any "mostly duplicate function" to which it corresponds (for
-example, comments and small code changes), preventing an exact match. Pairs of
-such functions are sometimes referred to as "similar".</p>
-
-<p>This class of problem can often be more insidious than mere duplication, because the two
-implementations have diverged. This may be on purpose (when a function is copy-and-pasted
-and adapted to a new context) or accidentally (when a correction is only introduced in one of
-several identical pieces of code), and to address the problem one needs to understand which
-of the two situations applies.</p>
-
-</overview>
-<recommendation>
-<p>Code duplication in general is highly undesirable for a range of reasons: The artificially
-inflated amount of code hinders comprehension, and ranges of similar but subtly different lines
-can mask the real purpose or intention behind a function. There's also a risk of
-update anomalies, where only one of several copies of the code is updated to address a defect or
-add a feature.</p>
-
-<p>In the case of function similarity, how to address the issue depends on the functions
-themselves and on the precise classes in which they occur. At its simplest, if the differences
-are accidental, the problem can be addressed by unifying the functions to behave identically.
-Then, we can remove all but one of the duplicate function definitions and make
-callers of the removed functions refer to the (now canonical) single remaining definition
-instead.</p>
-
-<p>In more complex cases, look for ways of encapsulating the commonality and sharing it while
-retaining the differences in functionality. Perhaps the function can be moved to a single place
-and given an additional parameter, allowing it to cover all use cases? Alternatively, there
-may be a common preprocessing or postprocessing step which can be extracted to its own (shared)
-function, leaving only the specific parts in the existing functions.</p>
-
-<p>Modern IDEs may provide refactoring support for this sort of transformation. Relevant
-refactorings might be "Extract function", "Change function signature", "Pull up" or "Extract
-supertype".</p>
-
-</recommendation>
-<references>
-
-<li>Elmar Juergens, Florian Deissenboeck, Benjamin Hummel, and Stefan Wagner. 2009. 
-Do code clones matter?  In <em>Proceedings of the 31st International Conference on
-Software Engineering</em> (ICSE '09). IEEE Computer Society, Washington, DC, USA, 
-485-495.</li>
-
-
-</references>
-</qhelp>
diff --git a/cpp/ql/src/external/MostlyDuplicateFunction.ql b/cpp/ql/src/external/MostlyDuplicateFunction.ql
deleted file mode 100644
index 8a7454e4c97..00000000000
--- a/cpp/ql/src/external/MostlyDuplicateFunction.ql
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @deprecated
- * @name Mostly duplicate function
- * @description There is another function that shares a lot of the code with this one. Extract the code to a common file/superclass or delegate to improve sharing.
- * @kind problem
- * @id cpp/mostly-duplicate-function
- * @problem.severity recommendation
- * @precision medium
- * @tags testability
- *       duplicate-code
- *       non-attributable
- */
-
-import cpp
-import CodeDuplication
-
-from FunctionDeclarationEntry m, int covered, int total, FunctionDeclarationEntry other, int percent
-where
-  duplicateStatements(m, other, covered, total) and
-  covered != total and
-  total > 5 and
-  covered * 100 / total = percent and
-  percent > 80 and
-  not m.getFunction().isConstructedFrom(_) and
-  not other.getFunction().isConstructedFrom(_) and
-  not duplicateMethod(m, other) and
-  not classLevelDuplication(m.getFunction().getDeclaringType(),
-    other.getFunction().getDeclaringType()) and
-  not fileLevelDuplication(m.getFile(), other.getFile())
-select m, percent + "% of the statements in " + m.getName() + " are duplicated in $@.", other,
-  other.getFunction().getQualifiedName()
diff --git a/cpp/ql/src/external/MostlySimilarFile.qhelp b/cpp/ql/src/external/MostlySimilarFile.qhelp
deleted file mode 100644
index e1a41a16321..00000000000
--- a/cpp/ql/src/external/MostlySimilarFile.qhelp
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>Two lines are defined as similar if they are either identical or contain only very minor
-differences. In cases where most of the lines in a file have corresponding "similar" lines in another file, 
-the files themselves are highlighted as "mostly similar", instead of creating a large number of method-level or class-level
-warnings. The same caveats apply here, too.</p>
-
-</overview>
-<recommendation>
-<p>Code duplication in general is highly undesirable for a range of reasons: The artificially
-inflated amount of code hinders comprehension, and ranges of similar but subtly different lines
-can mask the real purpose or intention behind a method. There's also an omnipresent risk of
-update anomalies, where only one of several copies of the code is updated to address a defect or
-add a feature.</p>
-
-<p>With files that are marked as mostly similar, special care should be taken. Why are
-they almost the same, and why are there differences? If the differences are accidental (for
-example from corrections that were only applied to one copy), then unifying the files and removing
-all but one is the best thing to do. If the files have genuinely different tasks, it is worth
-thinking about the reasons for the similarity. Can some of the shared code be extracted into
-methods (perhaps with additional parameters, to cover the differences in behavior)? Should it
-be moved into a utility class or file that is accessible to all current implementations, or
-should a new level of abstraction be introduced?</p>
-
-</recommendation>
-<references>
-
-<li>Elmar Juergens, Florian Deissenboeck, Benjamin Hummel, and Stefan Wagner. 2009. 
-Do code clones matter?  In <em>Proceedings of the 31st International Conference on
-Software Engineering</em> (ICSE '09). IEEE Computer Society, Washington, DC, USA, 
-485-495.</li>
-
-</references>
-</qhelp>
diff --git a/cpp/ql/src/external/MostlySimilarFile.ql b/cpp/ql/src/external/MostlySimilarFile.ql
deleted file mode 100644
index 81a6ed02d6c..00000000000
--- a/cpp/ql/src/external/MostlySimilarFile.ql
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @deprecated
- * @name Mostly similar file
- * @description There is another file that shares a lot of the code with this file. Notice that names of variables and types may have been changed. Merge the two files to improve maintainability.
- * @kind problem
- * @id cpp/similar-file
- * @problem.severity recommendation
- * @precision medium
- * @tags testability
- *       maintainability
- *       duplicate-code
- *       non-attributable
- */
-
-import cpp
-import CodeDuplication
-
-from File f, File other, int percent
-where similarFiles(f, other, percent)
-select f, percent + "% of the lines in " + f.getBaseName() + " are similar to lines in $@.", other,
-  other.getBaseName()
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql b/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql
index 872a7443e6e..58b83e4bd13 100644
--- a/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql	
+++ b/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql	
@@ -27,13 +27,13 @@ predicate containsArray(Type t) {
   )
 }
 
-predicate functionAPIViolation(MemberFunction f) {
+predicate functionApiViolation(MemberFunction f) {
   f.isPublic() and
   containsArray(f.getAParameter().getType())
 }
 
 from MemberFunction m
 where
-  functionAPIViolation(m) and
+  functionApiViolation(m) and
   not m.getDeclaringType() instanceof Struct
 select m, "Raw arrays should not be used in interfaces. A container class should be used instead."
diff --git a/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql b/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql
index ed713c4b109..4c1f8cfdd7f 100644
--- a/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql	
+++ b/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql	
@@ -12,13 +12,13 @@
 import cpp
 
 // whether f is to be considered an API entry point, and hence reachable by default
-predicate isAPI(Function f) {
+predicate isApi(Function f) {
   f.hasName("main") or
   f.(MemberFunction).hasSpecifier("public")
 }
 
 predicate unusedFunction(Function f) {
-  not isAPI(f) and
+  not isApi(f) and
   not exists(FunctionCall c | c.getTarget() = f) and
   not exists(Access acc | acc.getTarget() = f) and
   f.hasDefinition()
diff --git a/cpp/ql/src/printAst.ql b/cpp/ql/src/printAst.ql
index f800fa3be3e..ae6b3052ec7 100644
--- a/cpp/ql/src/printAst.ql
+++ b/cpp/ql/src/printAst.ql
@@ -16,7 +16,7 @@ import definitions
  */
 external string selectedSourceFile();
 
-class Cfg extends PrintASTConfiguration {
+class Cfg extends PrintAstConfiguration {
   /**
    * Holds if the AST for `func` should be printed.
    * Print All functions from the selected file.
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index 78d0169a538..a9d08527b8c 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: 
   - cpp
   - queries
diff --git a/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll b/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
index 7d605a491ee..a4d264b2703 100644
--- a/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -124,7 +124,9 @@ abstract class InlineExpectationsTest extends string {
   abstract predicate hasActualResult(Location location, string element, string tag, string value);
 
   /**
-   * Like `hasActualResult`, but returns results that do not require a matching annotation.
+   * Holds if there is an optional result on the specified location.
+   *
+   * This is similar to `hasActualResult`, but returns results that do not require a matching annotation.
    * A failure will still arise if there is an annotation that does not match any results, but not vice versa.
    * Override this predicate to specify optional results.
    */
diff --git a/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll b/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
index 87602ef0e4c..5841412331d 100644
--- a/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
+++ b/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
@@ -42,8 +42,8 @@ class IRFlowTest extends InlineExpectationsTest {
   }
 }
 
-class ASTFlowTest extends InlineExpectationsTest {
-  ASTFlowTest() { this = "ASTFlowTest" }
+class AstFlowTest extends InlineExpectationsTest {
+  AstFlowTest() { this = "ASTFlowTest" }
 
   override string getARelevantTag() { result = "ast" }
 
@@ -69,3 +69,6 @@ class ASTFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+/** DEPRECATED: Alias for AstFlowTest */
+deprecated class ASTFlowTest = AstFlowTest;
diff --git a/cpp/ql/test/examples/expressions/PrintAST.expected b/cpp/ql/test/examples/expressions/PrintAST.expected
index eb81accc996..68ade61e255 100644
--- a/cpp/ql/test/examples/expressions/PrintAST.expected
+++ b/cpp/ql/test/examples/expressions/PrintAST.expected
@@ -128,7 +128,7 @@ ConstructorCall.cpp:
 #    1|   <params>: 
 #-----|     getParameter(0): [Parameter] (unnamed parameter 0)
 #-----|         Type = [RValueReferenceType] C &&
-#    3| [ConversionConstructor] void C::C(int)
+#    3| [Constructor] void C::C(int)
 #    3|   <params>: 
 #    3|     getParameter(0): [Parameter] i
 #    3|         Type = [IntType] int
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/DangerousUseOfTransformationAfterOperation.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/DangerousUseOfTransformationAfterOperation.expected
new file mode 100644
index 00000000000..dd37faf2d56
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/DangerousUseOfTransformationAfterOperation.expected
@@ -0,0 +1,4 @@
+| test.cpp:9:8:9:12 | ... * ... | Possible signed overflow followed by offset of the pointer out of bounds. |
+| test.cpp:13:24:13:28 | ... * ... | This transformation is applied after multiplication. |
+| test.cpp:16:28:16:32 | ... * ... | This transformation is applied after multiplication. |
+| test.cpp:19:22:19:26 | ... * ... | This transformation is applied after multiplication. |
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/DangerousUseOfTransformationAfterOperation.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/DangerousUseOfTransformationAfterOperation.qlref
new file mode 100644
index 00000000000..84f717acda7
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/DangerousUseOfTransformationAfterOperation.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/test.cpp
new file mode 100644
index 00000000000..472c8ac0afa
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation/test.cpp
@@ -0,0 +1,23 @@
+void testCall (unsigned long);
+void functionWork(char aA[10],unsigned int aUI) {
+
+  unsigned long aL;
+  char *aP;
+  int aI;
+
+  aI = (aUI*8)/10; // GOOD
+  aI = aUI*8; // BAD
+  aP = aA+aI;
+  aI = (int)aUI*8; // GOOD
+  
+  aL = (unsigned long)(aI*aI); // BAD
+  aL = ((unsigned long)aI*aI); // GOOD
+  
+  testCall((unsigned long)(aI*aI)); // BAD
+  testCall(((unsigned long)aI*aI)); // GOOD
+  
+  if((unsigned long)(aI*aI) > aL) // BAD
+    return;
+  if(((unsigned long)aI*aI) > aL) // GOOD
+    return;
+}
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/ExposureSensitiveInformationUnauthorizedActor.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/ExposureSensitiveInformationUnauthorizedActor.expected
new file mode 100644
index 00000000000..0e9e0870680
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/ExposureSensitiveInformationUnauthorizedActor.expected
@@ -0,0 +1 @@
+| test.cpp:12:8:12:12 | call to fopen | You may have forgotten to restrict access rights when working with a file. |
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/ExposureSensitiveInformationUnauthorizedActor.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/ExposureSensitiveInformationUnauthorizedActor.qlref
new file mode 100644
index 00000000000..0fa00ffe3ab
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/ExposureSensitiveInformationUnauthorizedActor.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.ql
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/test.cpp
new file mode 100644
index 00000000000..6323d617ff1
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test1/test.cpp
@@ -0,0 +1,17 @@
+typedef int FILE;
+FILE *fopen(const char *filename, const char *mode);
+int umask(int pmode);
+int chmod(char * filename,int pmode);
+int fprintf(FILE *fp,const char *fmt, ...);
+int fclose(FILE *stream);
+
+int main(int argc, char *argv[])
+{
+  //umask(0022);
+  FILE *fp;
+  fp = fopen("myFile.txt","w"); // BAD
+  //chmod("myFile.txt",0644);
+  fprintf(fp,"%s\n","data to file");
+  fclose(fp);
+  return 0;
+}
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/ExposureSensitiveInformationUnauthorizedActor.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/ExposureSensitiveInformationUnauthorizedActor.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/ExposureSensitiveInformationUnauthorizedActor.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/ExposureSensitiveInformationUnauthorizedActor.qlref
new file mode 100644
index 00000000000..0fa00ffe3ab
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/ExposureSensitiveInformationUnauthorizedActor.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.ql
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/test.cpp
new file mode 100644
index 00000000000..27a86d49937
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test2/test.cpp
@@ -0,0 +1,17 @@
+typedef int FILE;
+FILE *fopen(const char *filename, const char *mode);
+int umask(int pmode);
+int chmod(char * filename,int pmode);
+int fprintf(FILE *fp,const char *fmt, ...);
+int fclose(FILE *stream);
+
+int main(int argc, char *argv[])
+{
+  umask(0022);
+  FILE *fp;
+  fp = fopen("myFile.txt","w"); // GOOD
+  chmod("myFile.txt",0644);
+  fprintf(fp,"%s\n","data to file");
+  fclose(fp);
+  return 0;
+}
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/ExposureSensitiveInformationUnauthorizedActor.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/ExposureSensitiveInformationUnauthorizedActor.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/ExposureSensitiveInformationUnauthorizedActor.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/ExposureSensitiveInformationUnauthorizedActor.qlref
new file mode 100644
index 00000000000..0fa00ffe3ab
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/ExposureSensitiveInformationUnauthorizedActor.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE/CWE-200/ExposureSensitiveInformationUnauthorizedActor.ql
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/test.cpp
new file mode 100644
index 00000000000..cadf28ca6ec
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-200/test3/test.cpp
@@ -0,0 +1,18 @@
+typedef int FILE;
+FILE *fopen(const char *filename, const char *mode);
+int umask(int pmode);
+int chmod(char * filename,int pmode);
+int fprintf(FILE *fp,const char *fmt, ...);
+char *fgets(char *str, int num, FILE *stream);
+int fclose(FILE *stream);
+
+int main(int argc, char *argv[])
+{
+  FILE *fp;
+  char buf[128];
+  fp = fopen("myFile.txt","r+"); // BAD [NOT DETECTED]
+  fgets(buf,128,fp); 
+  fprintf(fp,"%s\n","data to file");
+  fclose(fp);
+  return 0;
+}
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/InsecureTemporaryFile.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/InsecureTemporaryFile.expected
index b0632edcd2a..545b301922a 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/InsecureTemporaryFile.expected
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/InsecureTemporaryFile.expected
@@ -1,2 +1 @@
 | test.cpp:16:20:16:25 | call to tmpnam | Finding the name of a file that does not exist does not mean that it will not be exist at the next operation. |
-| test.cpp:42:8:42:12 | call to fopen | Creating a file for writing without evaluating its existence and setting permissions can be unsafe. |
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/test.cpp
index ceffdf11fa9..07efea49e78 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/test.cpp
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-377/semmle/tests/test.cpp
@@ -39,7 +39,7 @@ int funcTest3()
   FILE *fp;
   char filename[80];
   strcat(filename, "/tmp/tmp.name");
-  fp = fopen(filename,"w"); // BAD
+  fp = fopen(filename,"w"); // BAD [NOT DETECTED]
   fprintf(fp,"%s\n","data to file");
   fclose(fp);
   return 0;
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/ImproperCheckReturnValueScanf.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/ImproperCheckReturnValueScanf.expected
new file mode 100644
index 00000000000..85a929ed39c
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/ImproperCheckReturnValueScanf.expected
@@ -0,0 +1,8 @@
+| test.cpp:52:3:52:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:53:3:53:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:54:3:54:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:105:3:105:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:106:3:106:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:107:3:107:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:115:3:115:7 | call to scanf | Unchecked return value for call to 'scanf'. |
+| test.cpp:120:3:120:7 | call to scanf | Unchecked return value for call to 'scanf'. |
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/ImproperCheckReturnValueScanf.qlref b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/ImproperCheckReturnValueScanf.qlref
new file mode 100644
index 00000000000..f0cb9dd57c1
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/ImproperCheckReturnValueScanf.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE/CWE-754/ImproperCheckReturnValueScanf.ql
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/test.cpp
new file mode 100644
index 00000000000..b9608b757b9
--- /dev/null
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-754/semmle/tests/test.cpp
@@ -0,0 +1,129 @@
+int scanf(const char *format, ...);
+int sscanf(const char *str, const char *format, ...);
+int globalVal;
+char * globalVala;
+int * globalValp;
+char globalVala2;
+int functionWork1(int retIndex) {
+  int i;
+  char a[10];
+  int b;
+  int *p = &b;
+  if (scanf("%i", &i) != 1) // GOOD
+    return -1;
+  if (scanf("%s", a) != 1) // GOOD
+    return -1;
+  if (scanf("%i", p) != 1) // GOOD
+    return -1;
+  if(retIndex == 0)
+    return (int)*a;
+  if(retIndex == 1)
+    return *p;
+  return i;
+}
+
+int functionWork1_(int retIndex) {
+  int i;
+  char a[10];
+  int b;
+  int *p = &b;
+  int r;
+  r = scanf("%i", &i);
+  if (r != 1) // GOOD
+    return -1;
+  r = scanf("%s", a);
+  if (r == 1) // GOOD
+    return -1;
+  r = scanf("%i", p);
+  if (r != 1) // GOOD
+    return -1;
+  if(retIndex == 0)
+    return (int)*a;
+  if(retIndex == 1)
+    return *p;
+  return i;
+}
+
+int functionWork1b(int retIndex) {
+  int i;
+  char a[10];
+  int b;
+  int *p = &b;
+  scanf("%i", &i); // BAD
+  scanf("%s", a); // BAD
+  scanf("%i", p); // BAD
+  if(retIndex == 0)
+    return (int)*a;
+  if(retIndex == 1)
+    return *p;
+  return i;
+}
+int functionWork1_() {
+  int i;
+  scanf("%i",&i); // BAD [NOT DETECTED]
+  if(i<10)
+    return -1;
+  return i;
+}
+int functionWork2(int retIndex) {
+  int i = 0;
+  char a[10] = "";
+  int b = 1;
+  int *p = &b;
+  scanf("%i", &i); // GOOD:Argument initialized even when scanf fails.
+  scanf("%s", a); // GOOD:Argument initialized even when scanf fails.
+  scanf("%i", p); // GOOD:Argument initialized even when scanf fails.
+  if(retIndex == 0)
+    return (int)*a;
+  if(retIndex == 1)
+    return *p;
+  return i;
+}
+
+int functionWork2_(int retIndex) {
+  int i;
+  i = 0;
+  char a[10];
+  a[0] = '\0';
+  int b;
+  b=1;
+  int *p = &b;
+  scanf("%i", &i); // GOOD:Argument initialized even when scanf fails.
+  scanf("%s", a); // GOOD:Argument initialized even when scanf fails.
+  scanf("%i", p); // GOOD:Argument initialized even when scanf fails.
+  if(retIndex == 0)
+    return (int)*a;
+  if(retIndex == 1)
+    return *p;
+  return i;
+}
+int functionWork2b() {
+  int i;
+  char a[10];
+  int b;
+  int *p = &b;
+  scanf("%i", &i); // BAD
+  scanf("%s", a); // BAD
+  scanf("%i", p); // BAD
+  globalVal = i;
+  globalVala = a;
+  globalValp = p;
+  return 0;
+}
+int functionWork2b_() {
+  char a[10];
+  scanf("%s", a); // BAD
+  globalVala2 = a[0];
+  return 0;
+}
+int functionWork3b(int * i) {
+  scanf("%i", i); // BAD
+  return 0;
+}
+int functionWork3() {
+  char number[] = "42";
+  int d;
+  sscanf(number, "%d", &d); // GOOD: sscanf always succeeds
+  if (d < 16)
+    return -1;
+}
diff --git a/cpp/ql/test/library-tests/cpp11_g/cfg.ql b/cpp/ql/test/library-tests/cpp11_g/cfg.ql
index 5fe85186273..105b4e709ee 100644
--- a/cpp/ql/test/library-tests/cpp11_g/cfg.ql
+++ b/cpp/ql/test/library-tests/cpp11_g/cfg.ql
@@ -1,5 +1,4 @@
 import cpp
-import semmle.code.cpp.exprs.ObjectiveC
 
 string arguments(Function f, int i) {
   result = "," and i = -1
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql
index c1477d788ca..1737bb0bb33 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql
@@ -67,8 +67,8 @@ class IRDefaultTaintTrackingTest extends InlineExpectationsTest {
   }
 }
 
-class ASTTaintTrackingTest extends InlineExpectationsTest {
-  ASTTaintTrackingTest() { this = "ASTTaintTrackingTest" }
+class AstTaintTrackingTest extends InlineExpectationsTest {
+  AstTaintTrackingTest() { this = "ASTTaintTrackingTest" }
 
   override string getARelevantTag() { result = "ast" }
 
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql
index 5784906862b..61014bbd48f 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql
@@ -55,8 +55,8 @@ class IRDefaultTaintTrackingTest extends InlineExpectationsTest {
   }
 }
 
-class ASTTaintTrackingTest extends InlineExpectationsTest {
-  ASTTaintTrackingTest() { this = "ASTTaintTrackingTest" }
+class AstTaintTrackingTest extends InlineExpectationsTest {
+  AstTaintTrackingTest() { this = "ASTTaintTrackingTest" }
 
   override string getARelevantTag() { result = "ast" }
 
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql
index 953b15a9f9c..a9a4a1af231 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql
@@ -27,8 +27,8 @@ class IRGlobalDefaultTaintTrackingTest extends InlineExpectationsTest {
   }
 }
 
-class ASTGlobalDefaultTaintTrackingTest extends InlineExpectationsTest {
-  ASTGlobalDefaultTaintTrackingTest() { this = "ASTGlobalDefaultTaintTrackingTest" }
+class AstGlobalDefaultTaintTrackingTest extends InlineExpectationsTest {
+  AstGlobalDefaultTaintTrackingTest() { this = "ASTGlobalDefaultTaintTrackingTest" }
 
   override string getARelevantTag() { result = "ast" }
 
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
index 331956083ad..63c20affad1 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
@@ -1,6 +1,6 @@
 import TestUtilities.dataflow.FlowTestCommon
 
-module ASTTest {
+module AstTest {
   private import semmle.code.cpp.dataflow.DataFlow
 
   /**
@@ -18,8 +18,8 @@ module ASTTest {
   }
 
   /** Common data flow configuration to be used by tests. */
-  class ASTTestAllocationConfig extends DataFlow::Configuration {
-    ASTTestAllocationConfig() { this = "ASTTestAllocationConfig" }
+  class AstTestAllocationConfig extends DataFlow::Configuration {
+    AstTestAllocationConfig() { this = "ASTTestAllocationConfig" }
 
     override predicate isSource(DataFlow::Node source) {
       source.asExpr().(FunctionCall).getTarget().getName() = "source"
@@ -100,10 +100,10 @@ module IRTest {
   }
 
   private predicate readsVariable(LoadInstruction load, Variable var) {
-    load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+    load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
   }
 
   private predicate writesVariable(StoreInstruction store, Variable var) {
-    store.getDestinationAddress().(VariableAddressInstruction).getASTVariable() = var
+    store.getDestinationAddress().(VariableAddressInstruction).getAstVariable() = var
   }
 }
diff --git a/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll b/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll
index 67017f63abd..39d6cff3492 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll
+++ b/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll
@@ -1,8 +1,8 @@
 private import semmle.code.cpp.dataflow.DataFlow
 private import DataFlow
 
-class ASTConf extends Configuration {
-  ASTConf() { this = "ASTFieldFlowConf" }
+class AstConf extends Configuration {
+  AstConf() { this = "ASTFieldFlowConf" }
 
   override predicate isSource(Node src) {
     src.asExpr() instanceof NewExpr
@@ -30,3 +30,6 @@ class ASTConf extends Configuration {
     b.asExpr().(AddressOfExpr).getOperand() = a.asExpr()
   }
 }
+
+/** DEPRECATED: Alias for AstConf */
+deprecated class ASTConf = AstConf;
diff --git a/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll b/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll
index eb6f3247b82..2c3186b3dfa 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll
+++ b/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll
@@ -3,7 +3,7 @@ private import semmle.code.cpp.dataflow.DataFlow as AST
 private import cpp
 
 private newtype TNode =
-  TASTNode(AST::DataFlow::Node n) or
+  TAstNode(AST::DataFlow::Node n) or
   TIRNode(IR::DataFlow::Node n)
 
 class Node extends TNode {
@@ -11,23 +11,32 @@ class Node extends TNode {
 
   IR::DataFlow::Node asIR() { none() }
 
-  AST::DataFlow::Node asAST() { none() }
+  AST::DataFlow::Node asAst() { none() }
+
+  /** DEPRECATED: Alias for asAst */
+  deprecated AST::DataFlow::Node asAST() { result = asAst() }
 
   Location getLocation() { none() }
 }
 
-class ASTNode extends Node, TASTNode {
+class AstNode extends Node, TAstNode {
   AST::DataFlow::Node n;
 
-  ASTNode() { this = TASTNode(n) }
+  AstNode() { this = TAstNode(n) }
 
   override string toString() { result = n.toString() }
 
-  override AST::DataFlow::Node asAST() { result = n }
+  override AST::DataFlow::Node asAst() { result = n }
+
+  /** DEPRECATED: Alias for asAst */
+  deprecated override AST::DataFlow::Node asAST() { result = asAst() }
 
   override Location getLocation() { result = n.getLocation() }
 }
 
+/** DEPRECATED: Alias for AstNode */
+deprecated class ASTNode = AstNode;
+
 class IRNode extends Node, TIRNode {
   IR::DataFlow::Node n;
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/flow.ql b/cpp/ql/test/library-tests/dataflow/fields/flow.ql
index 23a7281c718..f902afd33db 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/flow.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/flow.ql
@@ -1,6 +1,6 @@
 import TestUtilities.dataflow.FlowTestCommon
 
-module ASTTest {
+module AstTest {
   private import ASTConfiguration
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql
index fae4b06da5a..3baba1a02ff 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql
@@ -7,8 +7,8 @@ import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow as IR
 import semmle.code.cpp.dataflow.DataFlow::DataFlow as AST
 import Nodes
 
-class ASTPartialDefNode extends ASTNode {
-  ASTPartialDefNode() { exists(n.asPartialDefinition()) }
+class AstPartialDefNode extends AstNode {
+  AstPartialDefNode() { exists(n.asPartialDefinition()) }
 
   override string toString() { result = n.asPartialDefinition().toString() }
 }
@@ -29,7 +29,7 @@ where
   msg = "IR only"
   or
   exists(AST::Node astNode, Expr partial |
-    node.asAST() = astNode and
+    node.asAst() = astNode and
     partial = astNode.asPartialDefinition() and
     not exists(IR::Node otherNode | otherNode.asPartialDefinition() = partial)
   ) and
diff --git a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
index 1772a3d6ad2..b1aeadfbb60 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
@@ -7,6 +7,6 @@ import ASTConfiguration
 import cpp
 import DataFlow::PathGraph
 
-from DataFlow::PathNode src, DataFlow::PathNode sink, ASTConf conf
+from DataFlow::PathNode src, DataFlow::PathNode sink, AstConf conf
 where conf.hasFlowPath(src, sink)
 select sink, src, sink, sink + " flows from $@", src, src.toString()
diff --git a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
index 4f18139b2af..d16552d983d 100644
--- a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
+++ b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
@@ -1,10 +1,10 @@
 import TestUtilities.dataflow.FlowTestCommon
 
-module ASTTest {
+module AstTest {
   private import semmle.code.cpp.dataflow.TaintTracking
 
-  class ASTSmartPointerTaintConfig extends TaintTracking::Configuration {
-    ASTSmartPointerTaintConfig() { this = "ASTSmartPointerTaintConfig" }
+  class AstSmartPointerTaintConfig extends TaintTracking::Configuration {
+    AstSmartPointerTaintConfig() { this = "ASTSmartPointerTaintConfig" }
 
     override predicate isSource(DataFlow::Node source) {
       source.asExpr().(FunctionCall).getTarget().getName() = "source"
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
index 4bf7420a9fd..bd513adcef2 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
@@ -38,13 +38,13 @@ module TaintModels {
   }
 }
 
-module ASTTest {
+module AstTest {
   private import semmle.code.cpp.dataflow.TaintTracking
   private import semmle.code.cpp.models.interfaces.Taint
 
   /** Common data flow configuration to be used by tests. */
-  class ASTTestAllocationConfig extends TaintTracking::Configuration {
-    ASTTestAllocationConfig() { this = "ASTTestAllocationConfig" }
+  class AstTestAllocationConfig extends TaintTracking::Configuration {
+    AstTestAllocationConfig() { this = "ASTTestAllocationConfig" }
 
     override predicate isSource(DataFlow::Node source) {
       source.asExpr().(FunctionCall).getTarget().getName() = "source"
diff --git a/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql b/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql
index fdb42979dc5..a9c52dd8223 100644
--- a/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql
+++ b/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql
@@ -1,7 +1,7 @@
 import cpp
 
-Function getCFGFunction(Initializer i) { result = i.getASuccessor*() }
+Function getCfgFunction(Initializer i) { result = i.getASuccessor*() }
 
 from Initializer i, string f
-where if exists(getCFGFunction(i)) then f = getCFGFunction(i).toString() else f = ""
+where if exists(getCfgFunction(i)) then f = getCfgFunction(i).toString() else f = ""
 select i, f
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 9d3ca2171ce..86884faf491 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -5401,7 +5401,7 @@ ir.cpp:
 #  600|   <params>: 
 #  600|     getParameter(0): [Parameter] (unnamed parameter 0)
 #  600|         Type = [RValueReferenceType] String &&
-#  601| [ConversionConstructor] void String::String(char const*)
+#  601| [Constructor] void String::String(char const*)
 #  601|   <params>: 
 #  601|     getParameter(0): [Parameter] (unnamed parameter 0)
 #  601|         Type = [PointerType] const char *
@@ -10630,7 +10630,7 @@ ir.cpp:
 # 1330|   <params>: 
 #-----|     getParameter(0): [Parameter] (unnamed parameter 0)
 #-----|         Type = [RValueReferenceType] constructor_only &&
-# 1335| [ConversionConstructor] void constructor_only::constructor_only(int)
+# 1335| [Constructor] void constructor_only::constructor_only(int)
 # 1335|   <params>: 
 # 1335|     getParameter(0): [Parameter] x
 # 1335|         Type = [IntType] int
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.ql b/cpp/ql/test/library-tests/ir/ir/PrintAST.ql
index e107c80de02..471b12ed3e5 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.ql
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.ql
@@ -6,6 +6,6 @@ private import cpp
 private import semmle.code.cpp.PrintAST
 private import PrintConfig
 
-private class PrintConfig extends PrintASTConfiguration {
+private class PrintConfig extends PrintAstConfiguration {
   override predicate shouldPrintFunction(Function func) { shouldDumpFunction(func) }
 }
diff --git a/cpp/ql/test/library-tests/ir/points_to/points_to.ql b/cpp/ql/test/library-tests/ir/points_to/points_to.ql
index b639a235ee8..6cc7b7efb34 100644
--- a/cpp/ql/test/library-tests/ir/points_to/points_to.ql
+++ b/cpp/ql/test/library-tests/ir/points_to/points_to.ql
@@ -40,7 +40,7 @@ module Raw {
   }
 }
 
-module UnaliasedSSA {
+module UnaliasedSsa {
   private import semmle.code.cpp.ir.implementation.unaliased_ssa.IR
   private import semmle.code.cpp.ir.implementation.aliased_ssa.internal.AliasedSSA
 
@@ -49,8 +49,8 @@ module UnaliasedSSA {
     result = getOperandMemoryLocation(instr.getAnOperand())
   }
 
-  class UnaliasedSSAPointsToTest extends InlineExpectationsTest {
-    UnaliasedSSAPointsToTest() { this = "UnaliasedSSAPointsToTest" }
+  class UnaliasedSsaPointsToTest extends InlineExpectationsTest {
+    UnaliasedSsaPointsToTest() { this = "UnaliasedSSAPointsToTest" }
 
     override string getARelevantTag() { result = "ussa" }
 
diff --git a/cpp/ql/test/library-tests/special_members/generated_copy/assign.expected b/cpp/ql/test/library-tests/special_members/generated_copy/assign.expected
index eec36e7e39c..28c90cb5233 100644
--- a/cpp/ql/test/library-tests/special_members/generated_copy/assign.expected
+++ b/cpp/ql/test/library-tests/special_members/generated_copy/assign.expected
@@ -11,6 +11,7 @@
 | difference::Base | can | does NOT | have implicit copy assignment |
 | difference::OnlyAssign | can | does | have implicit copy assignment |
 | difference::OnlyCtor | can NOT | does NOT | have implicit copy assignment |
+| instantiated_explicit_ctor::Wrapper<int> | can | does | have implicit copy assignment |
 | moves::MoveAssign | can NOT | does NOT | have implicit copy assignment |
 | moves::MoveCtor | can NOT | does NOT | have implicit copy assignment |
 | private_cc::C | can | does NOT | have implicit copy assignment |
diff --git a/cpp/ql/test/library-tests/special_members/generated_copy/copy.cpp b/cpp/ql/test/library-tests/special_members/generated_copy/copy.cpp
index 8d68cfdc09e..fac52670bca 100644
--- a/cpp/ql/test/library-tests/special_members/generated_copy/copy.cpp
+++ b/cpp/ql/test/library-tests/special_members/generated_copy/copy.cpp
@@ -131,3 +131,21 @@ namespace difference {
   class OnlyAssign : Base {
   };
 }
+
+namespace instantiated_explicit_ctor {
+  template<class T>
+  class Wrapper {
+  public:
+    Wrapper(Wrapper<T> &other) {
+      m_t = other.m_t;
+    }
+    
+    Wrapper() {
+      m_t = 0;
+    }
+  private:
+    T m_t;
+  };
+
+  Wrapper<int> wrapped_int;
+}
diff --git a/cpp/ql/test/library-tests/special_members/generated_copy/ctor.expected b/cpp/ql/test/library-tests/special_members/generated_copy/ctor.expected
index 22745978bf8..90a3f811e5d 100644
--- a/cpp/ql/test/library-tests/special_members/generated_copy/ctor.expected
+++ b/cpp/ql/test/library-tests/special_members/generated_copy/ctor.expected
@@ -11,6 +11,7 @@
 | difference::Base | can | does NOT | have implicit copy constructor |
 | difference::OnlyAssign | can NOT | does NOT | have implicit copy constructor |
 | difference::OnlyCtor | can | does | have implicit copy constructor |
+| instantiated_explicit_ctor::Wrapper<int> | can | does NOT | have implicit copy constructor |
 | moves::MoveAssign | can NOT | does NOT | have implicit copy constructor |
 | moves::MoveCtor | can NOT | does NOT | have implicit copy constructor |
 | private_cc::C | can | does NOT | have implicit copy constructor |
diff --git a/cpp/ql/test/library-tests/special_members/generated_copy/functions.expected b/cpp/ql/test/library-tests/special_members/generated_copy/functions.expected
index 22282641b37..434b950e35c 100644
--- a/cpp/ql/test/library-tests/special_members/generated_copy/functions.expected
+++ b/cpp/ql/test/library-tests/special_members/generated_copy/functions.expected
@@ -86,5 +86,9 @@
 | copy.cpp:131:9:131:9 | OnlyAssign | deleted |  |
 | copy.cpp:131:9:131:9 | operator= |  |  |
 | copy.cpp:131:9:131:9 | operator= |  |  |
+| copy.cpp:137:9:137:9 | operator= |  |  |
+| copy.cpp:139:5:139:11 | Wrapper |  |  |
+| copy.cpp:143:5:143:5 | Wrapper |  |  |
+| copy.cpp:143:5:143:11 | Wrapper |  |  |
 | file://:0:0:0:0 | operator= |  |  |
 | file://:0:0:0:0 | operator= |  |  |
diff --git a/cpp/ql/test/library-tests/stmt_expr/cfg.ql b/cpp/ql/test/library-tests/stmt_expr/cfg.ql
index b6699eaee11..772ee7d3888 100644
--- a/cpp/ql/test/library-tests/stmt_expr/cfg.ql
+++ b/cpp/ql/test/library-tests/stmt_expr/cfg.ql
@@ -1,5 +1,4 @@
 import cpp
-import semmle.code.cpp.exprs.ObjectiveC
 
 from ControlFlowNode x, ControlFlowNode y, string entryPoint
 where
diff --git a/cpp/ql/test/library-tests/variables/variables/variable.expected b/cpp/ql/test/library-tests/variables/variables/variable.expected
index e99ff83d440..05756351a88 100644
--- a/cpp/ql/test/library-tests/variables/variables/variable.expected
+++ b/cpp/ql/test/library-tests/variables/variables/variable.expected
@@ -30,7 +30,6 @@
 | variables.cpp:15:12:15:13 | v1 | file://:0:0:0:0 | int[10] | StaticStorageDurationVariable |  | static |
 | variables.cpp:15:21:15:22 | pv | file://:0:0:0:0 | int * | GlobalVariable |  | static |
 | variables.cpp:15:21:15:22 | pv | file://:0:0:0:0 | int * | StaticStorageDurationVariable |  | static |
-| variables.cpp:17:7:17:8 | fp | file://:0:0:0:0 | ..(*)(..) | FunctionPointerVariable |  |  |
 | variables.cpp:17:7:17:8 | fp | file://:0:0:0:0 | ..(*)(..) | GlobalVariable |  |  |
 | variables.cpp:17:7:17:8 | fp | file://:0:0:0:0 | ..(*)(..) | StaticStorageDurationVariable |  |  |
 | variables.cpp:19:7:19:8 | v2 | file://:0:0:0:0 | float[3] | GlobalVariable |  |  |
diff --git a/cpp/ql/test/query-tests/Critical/UnsafeUseOfThis/UnsafeUseOfThis.expected b/cpp/ql/test/query-tests/Critical/UnsafeUseOfThis/UnsafeUseOfThis.expected
index 2b1512242d1..6ea50ab7d8e 100644
--- a/cpp/ql/test/query-tests/Critical/UnsafeUseOfThis/UnsafeUseOfThis.expected
+++ b/cpp/ql/test/query-tests/Critical/UnsafeUseOfThis/UnsafeUseOfThis.expected
@@ -1,61 +1,103 @@
 edges
-| test.cpp:7:3:7:3 | InitializeParameter: B | test.cpp:8:12:8:15 | Load: this |
-| test.cpp:8:12:8:15 | Load: this | test.cpp:34:16:34:16 | InitializeParameter: x |
-| test.cpp:11:8:11:8 | InitializeParameter: b | test.cpp:12:5:12:5 | Load: b |
-| test.cpp:12:5:12:5 | CopyValue: (reference dereference) | test.cpp:12:5:12:5 | ConvertToNonVirtualBase: (A)... |
-| test.cpp:12:5:12:5 | Load: b | test.cpp:12:5:12:5 | CopyValue: (reference dereference) |
-| test.cpp:15:3:15:4 | InitializeParameter: ~B | test.cpp:16:5:16:5 | Load: this |
-| test.cpp:16:5:16:5 | Load: this | file://:0:0:0:0 | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:21:3:21:3 | InitializeParameter: C | test.cpp:21:13:21:13 | ConvertToNonVirtualBase: call to B |
-| test.cpp:21:3:21:3 | InitializeParameter: C | test.cpp:22:12:22:15 | Load: this |
-| test.cpp:21:3:21:3 | InitializeParameter: C | test.cpp:25:7:25:10 | Load: this |
-| test.cpp:21:13:21:13 | ConvertToNonVirtualBase: call to B | test.cpp:7:3:7:3 | InitializeParameter: B |
-| test.cpp:22:12:22:15 | ConvertToNonVirtualBase: (B *)... | test.cpp:34:16:34:16 | InitializeParameter: x |
-| test.cpp:22:12:22:15 | Load: this | test.cpp:22:12:22:15 | ConvertToNonVirtualBase: (B *)... |
-| test.cpp:25:7:25:10 | ConvertToNonVirtualBase: (B *)... | test.cpp:25:7:25:10 | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:25:7:25:10 | Load: this | test.cpp:25:7:25:10 | ConvertToNonVirtualBase: (B *)... |
-| test.cpp:31:3:31:3 | InitializeParameter: D | test.cpp:31:12:31:15 | Load: this |
-| test.cpp:31:11:31:15 | ConvertToNonVirtualBase: (B)... | test.cpp:31:11:31:15 | CopyValue: (reference to) |
-| test.cpp:31:11:31:15 | CopyValue: (reference to) | test.cpp:11:8:11:8 | InitializeParameter: b |
-| test.cpp:31:11:31:15 | CopyValue: * ... | test.cpp:31:11:31:15 | ConvertToNonVirtualBase: (B)... |
-| test.cpp:31:12:31:15 | Load: this | test.cpp:31:11:31:15 | CopyValue: * ... |
-| test.cpp:34:16:34:16 | InitializeParameter: x | test.cpp:35:3:35:3 | Load: x |
-| test.cpp:35:3:35:3 | Load: x | test.cpp:35:3:35:3 | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:47:3:47:3 | InitializeParameter: F | test.cpp:48:10:48:13 | Load: this |
-| test.cpp:48:10:48:13 | ConvertToNonVirtualBase: (E *)... | test.cpp:48:6:48:13 | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:48:10:48:13 | Load: this | test.cpp:48:10:48:13 | ConvertToNonVirtualBase: (E *)... |
+| test.cpp:7:3:7:3 | this | test.cpp:8:12:8:15 | Load |
+| test.cpp:8:12:8:15 | Load | test.cpp:8:12:8:15 | this |
+| test.cpp:8:12:8:15 | this | test.cpp:34:16:34:16 | x |
+| test.cpp:11:8:11:8 | b | test.cpp:12:5:12:5 | Load |
+| test.cpp:12:5:12:5 | (reference dereference) | test.cpp:12:5:12:5 | Unary |
+| test.cpp:12:5:12:5 | Load | test.cpp:12:5:12:5 | b |
+| test.cpp:12:5:12:5 | Unary | test.cpp:12:5:12:5 | (A)... |
+| test.cpp:12:5:12:5 | Unary | test.cpp:12:5:12:5 | (reference dereference) |
+| test.cpp:12:5:12:5 | b | test.cpp:12:5:12:5 | Unary |
+| test.cpp:15:3:15:4 | this | test.cpp:16:5:16:5 | Load |
+| test.cpp:16:5:16:5 | Load | test.cpp:16:5:16:5 | this |
+| test.cpp:16:5:16:5 | Unary | file://:0:0:0:0 | (A *)... |
+| test.cpp:16:5:16:5 | this | test.cpp:16:5:16:5 | Unary |
+| test.cpp:21:3:21:3 | Unary | test.cpp:21:13:21:13 | ConvertToNonVirtualBase |
+| test.cpp:21:3:21:3 | this | test.cpp:21:3:21:3 | Unary |
+| test.cpp:21:3:21:3 | this | test.cpp:22:12:22:15 | Load |
+| test.cpp:21:3:21:3 | this | test.cpp:25:7:25:10 | Load |
+| test.cpp:21:13:21:13 | ConvertToNonVirtualBase | test.cpp:7:3:7:3 | this |
+| test.cpp:22:12:22:15 | (B *)... | test.cpp:34:16:34:16 | x |
+| test.cpp:22:12:22:15 | Load | test.cpp:22:12:22:15 | this |
+| test.cpp:22:12:22:15 | Unary | test.cpp:22:12:22:15 | (B *)... |
+| test.cpp:22:12:22:15 | this | test.cpp:22:12:22:15 | Unary |
+| test.cpp:25:7:25:10 | (B *)... | test.cpp:25:7:25:10 | Unary |
+| test.cpp:25:7:25:10 | Load | test.cpp:25:7:25:10 | this |
+| test.cpp:25:7:25:10 | Unary | test.cpp:25:7:25:10 | (A *)... |
+| test.cpp:25:7:25:10 | Unary | test.cpp:25:7:25:10 | (B *)... |
+| test.cpp:25:7:25:10 | this | test.cpp:25:7:25:10 | Unary |
+| test.cpp:31:3:31:3 | this | test.cpp:31:12:31:15 | Load |
+| test.cpp:31:11:31:15 | (B)... | test.cpp:31:11:31:15 | Unary |
+| test.cpp:31:11:31:15 | (reference to) | test.cpp:11:8:11:8 | b |
+| test.cpp:31:11:31:15 | * ... | test.cpp:31:11:31:15 | Unary |
+| test.cpp:31:11:31:15 | Unary | test.cpp:31:11:31:15 | (B)... |
+| test.cpp:31:11:31:15 | Unary | test.cpp:31:11:31:15 | (reference to) |
+| test.cpp:31:12:31:15 | Load | test.cpp:31:12:31:15 | this |
+| test.cpp:31:12:31:15 | Unary | test.cpp:31:11:31:15 | * ... |
+| test.cpp:31:12:31:15 | this | test.cpp:31:12:31:15 | Unary |
+| test.cpp:34:16:34:16 | x | test.cpp:35:3:35:3 | Load |
+| test.cpp:35:3:35:3 | Load | test.cpp:35:3:35:3 | x |
+| test.cpp:35:3:35:3 | Unary | test.cpp:35:3:35:3 | (A *)... |
+| test.cpp:35:3:35:3 | x | test.cpp:35:3:35:3 | Unary |
+| test.cpp:47:3:47:3 | this | test.cpp:48:10:48:13 | Load |
+| test.cpp:48:10:48:13 | (E *)... | test.cpp:48:10:48:13 | Unary |
+| test.cpp:48:10:48:13 | Load | test.cpp:48:10:48:13 | this |
+| test.cpp:48:10:48:13 | Unary | test.cpp:48:6:48:13 | (A *)... |
+| test.cpp:48:10:48:13 | Unary | test.cpp:48:10:48:13 | (E *)... |
+| test.cpp:48:10:48:13 | this | test.cpp:48:10:48:13 | Unary |
 nodes
-| file://:0:0:0:0 | ConvertToNonVirtualBase: (A *)... | semmle.label | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:7:3:7:3 | InitializeParameter: B | semmle.label | InitializeParameter: B |
-| test.cpp:8:12:8:15 | Load: this | semmle.label | Load: this |
-| test.cpp:11:8:11:8 | InitializeParameter: b | semmle.label | InitializeParameter: b |
-| test.cpp:12:5:12:5 | ConvertToNonVirtualBase: (A)... | semmle.label | ConvertToNonVirtualBase: (A)... |
-| test.cpp:12:5:12:5 | CopyValue: (reference dereference) | semmle.label | CopyValue: (reference dereference) |
-| test.cpp:12:5:12:5 | Load: b | semmle.label | Load: b |
-| test.cpp:15:3:15:4 | InitializeParameter: ~B | semmle.label | InitializeParameter: ~B |
-| test.cpp:16:5:16:5 | Load: this | semmle.label | Load: this |
-| test.cpp:21:3:21:3 | InitializeParameter: C | semmle.label | InitializeParameter: C |
-| test.cpp:21:13:21:13 | ConvertToNonVirtualBase: call to B | semmle.label | ConvertToNonVirtualBase: call to B |
-| test.cpp:22:12:22:15 | ConvertToNonVirtualBase: (B *)... | semmle.label | ConvertToNonVirtualBase: (B *)... |
-| test.cpp:22:12:22:15 | Load: this | semmle.label | Load: this |
-| test.cpp:25:7:25:10 | ConvertToNonVirtualBase: (A *)... | semmle.label | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:25:7:25:10 | ConvertToNonVirtualBase: (B *)... | semmle.label | ConvertToNonVirtualBase: (B *)... |
-| test.cpp:25:7:25:10 | Load: this | semmle.label | Load: this |
-| test.cpp:31:3:31:3 | InitializeParameter: D | semmle.label | InitializeParameter: D |
-| test.cpp:31:11:31:15 | ConvertToNonVirtualBase: (B)... | semmle.label | ConvertToNonVirtualBase: (B)... |
-| test.cpp:31:11:31:15 | CopyValue: (reference to) | semmle.label | CopyValue: (reference to) |
-| test.cpp:31:11:31:15 | CopyValue: * ... | semmle.label | CopyValue: * ... |
-| test.cpp:31:12:31:15 | Load: this | semmle.label | Load: this |
-| test.cpp:34:16:34:16 | InitializeParameter: x | semmle.label | InitializeParameter: x |
-| test.cpp:35:3:35:3 | ConvertToNonVirtualBase: (A *)... | semmle.label | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:35:3:35:3 | Load: x | semmle.label | Load: x |
-| test.cpp:47:3:47:3 | InitializeParameter: F | semmle.label | InitializeParameter: F |
-| test.cpp:48:6:48:13 | ConvertToNonVirtualBase: (A *)... | semmle.label | ConvertToNonVirtualBase: (A *)... |
-| test.cpp:48:10:48:13 | ConvertToNonVirtualBase: (E *)... | semmle.label | ConvertToNonVirtualBase: (E *)... |
-| test.cpp:48:10:48:13 | Load: this | semmle.label | Load: this |
+| file://:0:0:0:0 | (A *)... | semmle.label | (A *)... |
+| test.cpp:7:3:7:3 | this | semmle.label | this |
+| test.cpp:8:12:8:15 | Load | semmle.label | Load |
+| test.cpp:8:12:8:15 | this | semmle.label | this |
+| test.cpp:11:8:11:8 | b | semmle.label | b |
+| test.cpp:12:5:12:5 | (A)... | semmle.label | (A)... |
+| test.cpp:12:5:12:5 | (reference dereference) | semmle.label | (reference dereference) |
+| test.cpp:12:5:12:5 | Load | semmle.label | Load |
+| test.cpp:12:5:12:5 | Unary | semmle.label | Unary |
+| test.cpp:12:5:12:5 | Unary | semmle.label | Unary |
+| test.cpp:12:5:12:5 | b | semmle.label | b |
+| test.cpp:15:3:15:4 | this | semmle.label | this |
+| test.cpp:16:5:16:5 | Load | semmle.label | Load |
+| test.cpp:16:5:16:5 | Unary | semmle.label | Unary |
+| test.cpp:16:5:16:5 | this | semmle.label | this |
+| test.cpp:21:3:21:3 | Unary | semmle.label | Unary |
+| test.cpp:21:3:21:3 | this | semmle.label | this |
+| test.cpp:21:13:21:13 | ConvertToNonVirtualBase | semmle.label | ConvertToNonVirtualBase |
+| test.cpp:22:12:22:15 | (B *)... | semmle.label | (B *)... |
+| test.cpp:22:12:22:15 | Load | semmle.label | Load |
+| test.cpp:22:12:22:15 | Unary | semmle.label | Unary |
+| test.cpp:22:12:22:15 | this | semmle.label | this |
+| test.cpp:25:7:25:10 | (A *)... | semmle.label | (A *)... |
+| test.cpp:25:7:25:10 | (B *)... | semmle.label | (B *)... |
+| test.cpp:25:7:25:10 | Load | semmle.label | Load |
+| test.cpp:25:7:25:10 | Unary | semmle.label | Unary |
+| test.cpp:25:7:25:10 | Unary | semmle.label | Unary |
+| test.cpp:25:7:25:10 | this | semmle.label | this |
+| test.cpp:31:3:31:3 | this | semmle.label | this |
+| test.cpp:31:11:31:15 | (B)... | semmle.label | (B)... |
+| test.cpp:31:11:31:15 | (reference to) | semmle.label | (reference to) |
+| test.cpp:31:11:31:15 | * ... | semmle.label | * ... |
+| test.cpp:31:11:31:15 | Unary | semmle.label | Unary |
+| test.cpp:31:11:31:15 | Unary | semmle.label | Unary |
+| test.cpp:31:12:31:15 | Load | semmle.label | Load |
+| test.cpp:31:12:31:15 | Unary | semmle.label | Unary |
+| test.cpp:31:12:31:15 | this | semmle.label | this |
+| test.cpp:34:16:34:16 | x | semmle.label | x |
+| test.cpp:35:3:35:3 | (A *)... | semmle.label | (A *)... |
+| test.cpp:35:3:35:3 | Load | semmle.label | Load |
+| test.cpp:35:3:35:3 | Unary | semmle.label | Unary |
+| test.cpp:35:3:35:3 | x | semmle.label | x |
+| test.cpp:47:3:47:3 | this | semmle.label | this |
+| test.cpp:48:6:48:13 | (A *)... | semmle.label | (A *)... |
+| test.cpp:48:10:48:13 | (E *)... | semmle.label | (E *)... |
+| test.cpp:48:10:48:13 | Load | semmle.label | Load |
+| test.cpp:48:10:48:13 | Unary | semmle.label | Unary |
+| test.cpp:48:10:48:13 | Unary | semmle.label | Unary |
+| test.cpp:48:10:48:13 | this | semmle.label | this |
 #select
-| test.cpp:12:7:12:7 | call to f | test.cpp:31:3:31:3 | InitializeParameter: D | test.cpp:12:5:12:5 | ConvertToNonVirtualBase: (A)... | Call to pure virtual function during construction |
-| test.cpp:16:5:16:5 | call to f | test.cpp:15:3:15:4 | InitializeParameter: ~B | file://:0:0:0:0 | ConvertToNonVirtualBase: (A *)... | Call to pure virtual function during destruction |
-| test.cpp:25:13:25:13 | call to f | test.cpp:21:3:21:3 | InitializeParameter: C | test.cpp:25:7:25:10 | ConvertToNonVirtualBase: (A *)... | Call to pure virtual function during construction |
-| test.cpp:35:6:35:6 | call to f | test.cpp:7:3:7:3 | InitializeParameter: B | test.cpp:35:3:35:3 | ConvertToNonVirtualBase: (A *)... | Call to pure virtual function during construction |
-| test.cpp:35:6:35:6 | call to f | test.cpp:21:3:21:3 | InitializeParameter: C | test.cpp:35:3:35:3 | ConvertToNonVirtualBase: (A *)... | Call to pure virtual function during construction |
+| test.cpp:12:7:12:7 | call to f | test.cpp:31:3:31:3 | this | test.cpp:12:5:12:5 | (A)... | Call to pure virtual function during construction |
+| test.cpp:16:5:16:5 | call to f | test.cpp:15:3:15:4 | this | file://:0:0:0:0 | (A *)... | Call to pure virtual function during destruction |
+| test.cpp:25:13:25:13 | call to f | test.cpp:21:3:21:3 | this | test.cpp:25:7:25:10 | (A *)... | Call to pure virtual function during construction |
+| test.cpp:35:6:35:6 | call to f | test.cpp:7:3:7:3 | this | test.cpp:35:3:35:3 | (A *)... | Call to pure virtual function during construction |
+| test.cpp:35:6:35:6 | call to f | test.cpp:21:3:21:3 | this | test.cpp:35:3:35:3 | (A *)... | Call to pure virtual function during construction |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/ReturnStackAllocatedMemory.expected b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/ReturnStackAllocatedMemory.expected
index 8f9d91fc1ad..6b8a59793a3 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/ReturnStackAllocatedMemory.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/ReturnStackAllocatedMemory.expected	
@@ -100,6 +100,12 @@ edges
 | test.cpp:190:10:190:13 | Unary | test.cpp:190:10:190:13 | (reference dereference) |
 | test.cpp:190:10:190:13 | Unary | test.cpp:190:10:190:13 | (reference to) |
 | test.cpp:190:10:190:13 | pRef | test.cpp:190:10:190:13 | Unary |
+| test.cpp:225:14:225:15 | px | test.cpp:226:10:226:11 | Load |
+| test.cpp:226:10:226:11 | Load | test.cpp:226:10:226:11 | px |
+| test.cpp:226:10:226:11 | px | test.cpp:226:10:226:11 | StoreValue |
+| test.cpp:231:16:231:17 | & ... | test.cpp:225:14:225:15 | px |
+| test.cpp:231:17:231:17 | Unary | test.cpp:231:16:231:17 | & ... |
+| test.cpp:231:17:231:17 | x | test.cpp:231:17:231:17 | Unary |
 nodes
 | test.cpp:17:9:17:11 | & ... | semmle.label | & ... |
 | test.cpp:17:9:17:11 | StoreValue | semmle.label | StoreValue |
@@ -215,6 +221,13 @@ nodes
 | test.cpp:190:10:190:13 | Unary | semmle.label | Unary |
 | test.cpp:190:10:190:13 | Unary | semmle.label | Unary |
 | test.cpp:190:10:190:13 | pRef | semmle.label | pRef |
+| test.cpp:225:14:225:15 | px | semmle.label | px |
+| test.cpp:226:10:226:11 | Load | semmle.label | Load |
+| test.cpp:226:10:226:11 | StoreValue | semmle.label | StoreValue |
+| test.cpp:226:10:226:11 | px | semmle.label | px |
+| test.cpp:231:16:231:17 | & ... | semmle.label | & ... |
+| test.cpp:231:17:231:17 | Unary | semmle.label | Unary |
+| test.cpp:231:17:231:17 | x | semmle.label | x |
 #select
 | test.cpp:17:9:17:11 | StoreValue | test.cpp:17:10:17:11 | mc | test.cpp:17:9:17:11 | StoreValue | May return stack-allocated memory from $@. | test.cpp:17:10:17:11 | mc | mc |
 | test.cpp:25:9:25:11 | StoreValue | test.cpp:23:18:23:19 | mc | test.cpp:25:9:25:11 | StoreValue | May return stack-allocated memory from $@. | test.cpp:23:18:23:19 | mc | mc |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/test.cpp
index a1726169654..2b53f9c0adf 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/test.cpp	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Memory Management/ReturnStackAllocatedMemory/test.cpp	
@@ -220,4 +220,13 @@ auto make_read_port()
 void* get_sp() {
 	int p;
 	return (void*)&p; // GOOD: The function name makes it sound like the programmer intended to get the value of the stack pointer.
+}
+
+int* id(int* px) {
+  return px; // GOOD
+}
+
+void f() {
+  int x;
+  int* px = id(&x); // GOOD
 }
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/OverflowDestination.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/OverflowDestination.expected
index e69de29bb2d..e217064d1df 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/OverflowDestination.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-119/SAMATE/OverflowDestination.expected
@@ -0,0 +1,4 @@
+edges
+nodes
+subpaths
+#select
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-119/semmle/tests/OverflowDestination.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-119/semmle/tests/OverflowDestination.expected
index 7f79034b954..2a9b25cb541 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-119/semmle/tests/OverflowDestination.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-119/semmle/tests/OverflowDestination.expected
@@ -1,4 +1,43 @@
-| overflowdestination.cpp:30:2:30:8 | call to strncpy | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
-| overflowdestination.cpp:46:2:46:7 | call to memcpy | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
-| overflowdestination.cpp:53:2:53:7 | call to memcpy | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
-| overflowdestination.cpp:64:2:64:7 | call to memcpy | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
+edges
+| overflowdestination.cpp:27:9:27:12 | argv | overflowdestination.cpp:30:17:30:20 | (const char *)... |
+| overflowdestination.cpp:43:8:43:10 | fgets output argument | overflowdestination.cpp:46:15:46:17 | (const void *)... |
+| overflowdestination.cpp:50:52:50:54 | *src | overflowdestination.cpp:50:52:50:54 | ReturnIndirection |
+| overflowdestination.cpp:50:52:50:54 | src | overflowdestination.cpp:53:15:53:17 | (const void *)... |
+| overflowdestination.cpp:57:52:57:54 | *src | overflowdestination.cpp:64:16:64:19 | (const void *)... |
+| overflowdestination.cpp:57:52:57:54 | src | overflowdestination.cpp:64:16:64:19 | (const void *)... |
+| overflowdestination.cpp:73:8:73:10 | fgets output argument | overflowdestination.cpp:75:30:75:32 | src |
+| overflowdestination.cpp:73:8:73:10 | fgets output argument | overflowdestination.cpp:75:30:75:32 | src indirection |
+| overflowdestination.cpp:73:8:73:10 | fgets output argument | overflowdestination.cpp:76:30:76:32 | src |
+| overflowdestination.cpp:73:8:73:10 | fgets output argument | overflowdestination.cpp:76:30:76:32 | src indirection |
+| overflowdestination.cpp:75:30:75:32 | overflowdest_test2 output argument | overflowdestination.cpp:76:30:76:32 | src |
+| overflowdestination.cpp:75:30:75:32 | overflowdest_test2 output argument | overflowdestination.cpp:76:30:76:32 | src indirection |
+| overflowdestination.cpp:75:30:75:32 | src | overflowdestination.cpp:50:52:50:54 | src |
+| overflowdestination.cpp:75:30:75:32 | src indirection | overflowdestination.cpp:50:52:50:54 | *src |
+| overflowdestination.cpp:75:30:75:32 | src indirection | overflowdestination.cpp:75:30:75:32 | overflowdest_test2 output argument |
+| overflowdestination.cpp:76:30:76:32 | src | overflowdestination.cpp:57:52:57:54 | src |
+| overflowdestination.cpp:76:30:76:32 | src indirection | overflowdestination.cpp:57:52:57:54 | *src |
+nodes
+| overflowdestination.cpp:27:9:27:12 | argv | semmle.label | argv |
+| overflowdestination.cpp:30:17:30:20 | (const char *)... | semmle.label | (const char *)... |
+| overflowdestination.cpp:43:8:43:10 | fgets output argument | semmle.label | fgets output argument |
+| overflowdestination.cpp:46:15:46:17 | (const void *)... | semmle.label | (const void *)... |
+| overflowdestination.cpp:50:52:50:54 | *src | semmle.label | *src |
+| overflowdestination.cpp:50:52:50:54 | ReturnIndirection | semmle.label | ReturnIndirection |
+| overflowdestination.cpp:50:52:50:54 | src | semmle.label | src |
+| overflowdestination.cpp:53:15:53:17 | (const void *)... | semmle.label | (const void *)... |
+| overflowdestination.cpp:57:52:57:54 | *src | semmle.label | *src |
+| overflowdestination.cpp:57:52:57:54 | src | semmle.label | src |
+| overflowdestination.cpp:64:16:64:19 | (const void *)... | semmle.label | (const void *)... |
+| overflowdestination.cpp:73:8:73:10 | fgets output argument | semmle.label | fgets output argument |
+| overflowdestination.cpp:75:30:75:32 | overflowdest_test2 output argument | semmle.label | overflowdest_test2 output argument |
+| overflowdestination.cpp:75:30:75:32 | src | semmle.label | src |
+| overflowdestination.cpp:75:30:75:32 | src indirection | semmle.label | src indirection |
+| overflowdestination.cpp:76:30:76:32 | src | semmle.label | src |
+| overflowdestination.cpp:76:30:76:32 | src indirection | semmle.label | src indirection |
+subpaths
+| overflowdestination.cpp:75:30:75:32 | src indirection | overflowdestination.cpp:50:52:50:54 | *src | overflowdestination.cpp:50:52:50:54 | ReturnIndirection | overflowdestination.cpp:75:30:75:32 | overflowdest_test2 output argument |
+#select
+| overflowdestination.cpp:30:2:30:8 | call to strncpy | overflowdestination.cpp:27:9:27:12 | argv | overflowdestination.cpp:30:17:30:20 | (const char *)... | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
+| overflowdestination.cpp:46:2:46:7 | call to memcpy | overflowdestination.cpp:43:8:43:10 | fgets output argument | overflowdestination.cpp:46:15:46:17 | (const void *)... | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
+| overflowdestination.cpp:53:2:53:7 | call to memcpy | overflowdestination.cpp:73:8:73:10 | fgets output argument | overflowdestination.cpp:53:15:53:17 | (const void *)... | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
+| overflowdestination.cpp:64:2:64:7 | call to memcpy | overflowdestination.cpp:73:8:73:10 | fgets output argument | overflowdestination.cpp:64:16:64:19 | (const void *)... | To avoid overflow, this operation should be bounded by destination-buffer size, not source-buffer size. |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/SAMATE/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/SAMATE/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 008ff07b800..5f8be65d740 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/SAMATE/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/SAMATE/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -1 +1,8 @@
-| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | inputBuffer | User-provided value |
+edges
+| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data |
+nodes
+| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | semmle.label | fgets output argument |
+| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | semmle.label | data |
+subpaths
+#select
+| CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:52:20:52:23 | data | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | CWE122_Heap_Based_Buffer_Overflow__c_CWE129_fgets_01.c:30:19:30:29 | fgets output argument | String read by fgets |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
index 8efbc165c86..97aa43e7bd1 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-129/semmle/ImproperArrayIndexValidation/ImproperArrayIndexValidation.expected
@@ -1,3 +1,26 @@
-| test1.c:18:16:18:16 | i | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | User-provided value |
-| test1.c:33:11:33:11 | i | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | User-provided value |
-| test1.c:53:15:53:15 | j | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | User-provided value |
+edges
+| test1.c:8:16:8:19 | argv | test1.c:9:9:9:9 | i |
+| test1.c:8:16:8:19 | argv | test1.c:11:9:11:9 | i |
+| test1.c:8:16:8:19 | argv | test1.c:13:9:13:9 | i |
+| test1.c:9:9:9:9 | i | test1.c:16:16:16:16 | i |
+| test1.c:11:9:11:9 | i | test1.c:32:16:32:16 | i |
+| test1.c:13:9:13:9 | i | test1.c:48:16:48:16 | i |
+| test1.c:16:16:16:16 | i | test1.c:18:16:18:16 | i |
+| test1.c:32:16:32:16 | i | test1.c:33:11:33:11 | i |
+| test1.c:48:16:48:16 | i | test1.c:53:15:53:15 | j |
+nodes
+| test1.c:8:16:8:19 | argv | semmle.label | argv |
+| test1.c:9:9:9:9 | i | semmle.label | i |
+| test1.c:11:9:11:9 | i | semmle.label | i |
+| test1.c:13:9:13:9 | i | semmle.label | i |
+| test1.c:16:16:16:16 | i | semmle.label | i |
+| test1.c:18:16:18:16 | i | semmle.label | i |
+| test1.c:32:16:32:16 | i | semmle.label | i |
+| test1.c:33:11:33:11 | i | semmle.label | i |
+| test1.c:48:16:48:16 | i | semmle.label | i |
+| test1.c:53:15:53:15 | j | semmle.label | j |
+subpaths
+#select
+| test1.c:18:16:18:16 | i | test1.c:8:16:8:19 | argv | test1.c:18:16:18:16 | i | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | a command-line argument |
+| test1.c:33:11:33:11 | i | test1.c:8:16:8:19 | argv | test1.c:33:11:33:11 | i | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | a command-line argument |
+| test1.c:53:15:53:15 | j | test1.c:8:16:8:19 | argv | test1.c:53:15:53:15 | j | $@ flows to here and is used in an array indexing expression, potentially causing an invalid access. | test1.c:8:16:8:19 | argv | a command-line argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/TaintedAllocationSize/TaintedAllocationSize.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/TaintedAllocationSize/TaintedAllocationSize.expected
index 2bee2123b7c..aa131cca152 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/TaintedAllocationSize/TaintedAllocationSize.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/TaintedAllocationSize/TaintedAllocationSize.expected
@@ -1,62 +1,20 @@
 edges
-| test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | (size_t)... |
-| test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | (size_t)... |
-| test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | tainted |
-| test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | tainted |
-| test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | tainted |
 | test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | tainted |
 | test.cpp:40:21:40:24 | argv | test.cpp:44:38:44:63 | ... * ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:44:38:44:63 | ... * ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:44:38:44:63 | ... * ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:44:38:44:63 | ... * ... |
 | test.cpp:40:21:40:24 | argv | test.cpp:46:38:46:63 | ... + ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:46:38:46:63 | ... + ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:46:38:46:63 | ... + ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:46:38:46:63 | ... + ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | (size_t)... |
-| test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | (size_t)... |
-| test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | size |
-| test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | size |
-| test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | size |
 | test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | size |
 | test.cpp:40:21:40:24 | argv | test.cpp:50:26:50:29 | size |
-| test.cpp:40:21:40:24 | argv | test.cpp:50:26:50:29 | size |
-| test.cpp:40:21:40:24 | argv | test.cpp:50:26:50:29 | size |
-| test.cpp:40:21:40:24 | argv | test.cpp:50:26:50:29 | size |
-| test.cpp:40:21:40:24 | argv | test.cpp:53:35:53:60 | ... * ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:53:35:53:60 | ... * ... |
-| test.cpp:40:21:40:24 | argv | test.cpp:53:35:53:60 | ... * ... |
 | test.cpp:40:21:40:24 | argv | test.cpp:53:35:53:60 | ... * ... |
 | test.cpp:124:18:124:23 | call to getenv | test.cpp:128:24:128:41 | ... * ... |
-| test.cpp:124:18:124:23 | call to getenv | test.cpp:128:24:128:41 | ... * ... |
-| test.cpp:124:18:124:31 | (const char *)... | test.cpp:128:24:128:41 | ... * ... |
-| test.cpp:124:18:124:31 | (const char *)... | test.cpp:128:24:128:41 | ... * ... |
 | test.cpp:133:19:133:24 | call to getenv | test.cpp:135:10:135:27 | ... * ... |
-| test.cpp:133:19:133:24 | call to getenv | test.cpp:135:10:135:27 | ... * ... |
-| test.cpp:133:19:133:32 | (const char *)... | test.cpp:135:10:135:27 | ... * ... |
-| test.cpp:133:19:133:32 | (const char *)... | test.cpp:135:10:135:27 | ... * ... |
 | test.cpp:148:20:148:25 | call to getenv | test.cpp:152:11:152:28 | ... * ... |
-| test.cpp:148:20:148:25 | call to getenv | test.cpp:152:11:152:28 | ... * ... |
-| test.cpp:148:20:148:33 | (const char *)... | test.cpp:152:11:152:28 | ... * ... |
-| test.cpp:148:20:148:33 | (const char *)... | test.cpp:152:11:152:28 | ... * ... |
-| test.cpp:209:8:209:23 | ReturnValue | test.cpp:241:9:241:24 | call to get_tainted_size |
 | test.cpp:209:8:209:23 | ReturnValue | test.cpp:241:9:241:24 | call to get_tainted_size |
 | test.cpp:211:14:211:19 | call to getenv | test.cpp:209:8:209:23 | ReturnValue |
-| test.cpp:211:14:211:27 | (const char *)... | test.cpp:209:8:209:23 | ReturnValue |
-| test.cpp:224:23:224:23 | s | test.cpp:225:21:225:21 | s |
 | test.cpp:224:23:224:23 | s | test.cpp:225:21:225:21 | s |
 | test.cpp:230:21:230:21 | s | test.cpp:231:21:231:21 | s |
-| test.cpp:230:21:230:21 | s | test.cpp:231:21:231:21 | s |
-| test.cpp:237:24:237:29 | call to getenv | test.cpp:239:9:239:18 | (size_t)... |
-| test.cpp:237:24:237:29 | call to getenv | test.cpp:239:9:239:18 | local_size |
 | test.cpp:237:24:237:29 | call to getenv | test.cpp:239:9:239:18 | local_size |
 | test.cpp:237:24:237:29 | call to getenv | test.cpp:245:11:245:20 | local_size |
 | test.cpp:237:24:237:29 | call to getenv | test.cpp:247:10:247:19 | local_size |
-| test.cpp:237:24:237:37 | (const char *)... | test.cpp:239:9:239:18 | (size_t)... |
-| test.cpp:237:24:237:37 | (const char *)... | test.cpp:239:9:239:18 | local_size |
-| test.cpp:237:24:237:37 | (const char *)... | test.cpp:239:9:239:18 | local_size |
-| test.cpp:237:24:237:37 | (const char *)... | test.cpp:245:11:245:20 | local_size |
-| test.cpp:237:24:237:37 | (const char *)... | test.cpp:247:10:247:19 | local_size |
 | test.cpp:245:11:245:20 | local_size | test.cpp:224:23:224:23 | s |
 | test.cpp:247:10:247:19 | local_size | test.cpp:230:21:230:21 | s |
 | test.cpp:251:2:251:9 | (reference dereference) [post update] | test.cpp:289:17:289:20 | size [post update] |
@@ -64,112 +22,57 @@ edges
 | test.cpp:251:18:251:23 | call to getenv | test.cpp:251:2:251:9 | (reference dereference) [post update] |
 | test.cpp:251:18:251:23 | call to getenv | test.cpp:289:17:289:20 | size [post update] |
 | test.cpp:251:18:251:23 | call to getenv | test.cpp:305:18:305:21 | size [post update] |
-| test.cpp:251:18:251:31 | (const char *)... | test.cpp:251:2:251:9 | (reference dereference) [post update] |
-| test.cpp:251:18:251:31 | (const char *)... | test.cpp:289:17:289:20 | size [post update] |
-| test.cpp:251:18:251:31 | (const char *)... | test.cpp:305:18:305:21 | size [post update] |
 | test.cpp:259:20:259:25 | call to getenv | test.cpp:263:11:263:29 | ... * ... |
-| test.cpp:259:20:259:25 | call to getenv | test.cpp:263:11:263:29 | ... * ... |
-| test.cpp:259:20:259:33 | (const char *)... | test.cpp:263:11:263:29 | ... * ... |
-| test.cpp:259:20:259:33 | (const char *)... | test.cpp:263:11:263:29 | ... * ... |
-| test.cpp:289:17:289:20 | size [post update] | test.cpp:291:11:291:28 | ... * ... |
 | test.cpp:289:17:289:20 | size [post update] | test.cpp:291:11:291:28 | ... * ... |
 | test.cpp:305:18:305:21 | size [post update] | test.cpp:308:10:308:27 | ... * ... |
-| test.cpp:305:18:305:21 | size [post update] | test.cpp:308:10:308:27 | ... * ... |
-subpaths
 nodes
 | test.cpp:40:21:40:24 | argv | semmle.label | argv |
-| test.cpp:40:21:40:24 | argv | semmle.label | argv |
-| test.cpp:43:38:43:44 | (size_t)... | semmle.label | (size_t)... |
-| test.cpp:43:38:43:44 | (size_t)... | semmle.label | (size_t)... |
-| test.cpp:43:38:43:44 | tainted | semmle.label | tainted |
-| test.cpp:43:38:43:44 | tainted | semmle.label | tainted |
 | test.cpp:43:38:43:44 | tainted | semmle.label | tainted |
 | test.cpp:44:38:44:63 | ... * ... | semmle.label | ... * ... |
-| test.cpp:44:38:44:63 | ... * ... | semmle.label | ... * ... |
-| test.cpp:44:38:44:63 | ... * ... | semmle.label | ... * ... |
 | test.cpp:46:38:46:63 | ... + ... | semmle.label | ... + ... |
-| test.cpp:46:38:46:63 | ... + ... | semmle.label | ... + ... |
-| test.cpp:46:38:46:63 | ... + ... | semmle.label | ... + ... |
-| test.cpp:49:32:49:35 | (size_t)... | semmle.label | (size_t)... |
-| test.cpp:49:32:49:35 | (size_t)... | semmle.label | (size_t)... |
-| test.cpp:49:32:49:35 | size | semmle.label | size |
-| test.cpp:49:32:49:35 | size | semmle.label | size |
 | test.cpp:49:32:49:35 | size | semmle.label | size |
 | test.cpp:50:26:50:29 | size | semmle.label | size |
-| test.cpp:50:26:50:29 | size | semmle.label | size |
-| test.cpp:50:26:50:29 | size | semmle.label | size |
-| test.cpp:53:35:53:60 | ... * ... | semmle.label | ... * ... |
-| test.cpp:53:35:53:60 | ... * ... | semmle.label | ... * ... |
 | test.cpp:53:35:53:60 | ... * ... | semmle.label | ... * ... |
 | test.cpp:124:18:124:23 | call to getenv | semmle.label | call to getenv |
-| test.cpp:124:18:124:31 | (const char *)... | semmle.label | (const char *)... |
-| test.cpp:128:24:128:41 | ... * ... | semmle.label | ... * ... |
-| test.cpp:128:24:128:41 | ... * ... | semmle.label | ... * ... |
 | test.cpp:128:24:128:41 | ... * ... | semmle.label | ... * ... |
 | test.cpp:133:19:133:24 | call to getenv | semmle.label | call to getenv |
-| test.cpp:133:19:133:32 | (const char *)... | semmle.label | (const char *)... |
-| test.cpp:135:10:135:27 | ... * ... | semmle.label | ... * ... |
-| test.cpp:135:10:135:27 | ... * ... | semmle.label | ... * ... |
 | test.cpp:135:10:135:27 | ... * ... | semmle.label | ... * ... |
 | test.cpp:148:20:148:25 | call to getenv | semmle.label | call to getenv |
-| test.cpp:148:20:148:33 | (const char *)... | semmle.label | (const char *)... |
-| test.cpp:152:11:152:28 | ... * ... | semmle.label | ... * ... |
-| test.cpp:152:11:152:28 | ... * ... | semmle.label | ... * ... |
 | test.cpp:152:11:152:28 | ... * ... | semmle.label | ... * ... |
 | test.cpp:209:8:209:23 | ReturnValue | semmle.label | ReturnValue |
 | test.cpp:211:14:211:19 | call to getenv | semmle.label | call to getenv |
-| test.cpp:211:14:211:27 | (const char *)... | semmle.label | (const char *)... |
 | test.cpp:224:23:224:23 | s | semmle.label | s |
 | test.cpp:225:21:225:21 | s | semmle.label | s |
-| test.cpp:225:21:225:21 | s | semmle.label | s |
-| test.cpp:225:21:225:21 | s | semmle.label | s |
 | test.cpp:230:21:230:21 | s | semmle.label | s |
 | test.cpp:231:21:231:21 | s | semmle.label | s |
-| test.cpp:231:21:231:21 | s | semmle.label | s |
-| test.cpp:231:21:231:21 | s | semmle.label | s |
 | test.cpp:237:24:237:29 | call to getenv | semmle.label | call to getenv |
-| test.cpp:237:24:237:37 | (const char *)... | semmle.label | (const char *)... |
-| test.cpp:239:9:239:18 | (size_t)... | semmle.label | (size_t)... |
-| test.cpp:239:9:239:18 | (size_t)... | semmle.label | (size_t)... |
 | test.cpp:239:9:239:18 | local_size | semmle.label | local_size |
-| test.cpp:239:9:239:18 | local_size | semmle.label | local_size |
-| test.cpp:239:9:239:18 | local_size | semmle.label | local_size |
-| test.cpp:241:9:241:24 | call to get_tainted_size | semmle.label | call to get_tainted_size |
-| test.cpp:241:9:241:24 | call to get_tainted_size | semmle.label | call to get_tainted_size |
 | test.cpp:241:9:241:24 | call to get_tainted_size | semmle.label | call to get_tainted_size |
 | test.cpp:245:11:245:20 | local_size | semmle.label | local_size |
 | test.cpp:247:10:247:19 | local_size | semmle.label | local_size |
 | test.cpp:251:2:251:9 | (reference dereference) [post update] | semmle.label | (reference dereference) [post update] |
-| test.cpp:251:2:251:9 | out_size [post update] | semmle.label | out_size [post update] |
 | test.cpp:251:18:251:23 | call to getenv | semmle.label | call to getenv |
-| test.cpp:251:18:251:31 | (const char *)... | semmle.label | (const char *)... |
 | test.cpp:259:20:259:25 | call to getenv | semmle.label | call to getenv |
-| test.cpp:259:20:259:33 | (const char *)... | semmle.label | (const char *)... |
-| test.cpp:263:11:263:29 | ... * ... | semmle.label | ... * ... |
-| test.cpp:263:11:263:29 | ... * ... | semmle.label | ... * ... |
 | test.cpp:263:11:263:29 | ... * ... | semmle.label | ... * ... |
 | test.cpp:289:17:289:20 | size [post update] | semmle.label | size [post update] |
 | test.cpp:291:11:291:28 | ... * ... | semmle.label | ... * ... |
-| test.cpp:291:11:291:28 | ... * ... | semmle.label | ... * ... |
-| test.cpp:291:11:291:28 | ... * ... | semmle.label | ... * ... |
 | test.cpp:305:18:305:21 | size [post update] | semmle.label | size [post update] |
 | test.cpp:308:10:308:27 | ... * ... | semmle.label | ... * ... |
-| test.cpp:308:10:308:27 | ... * ... | semmle.label | ... * ... |
-| test.cpp:308:10:308:27 | ... * ... | semmle.label | ... * ... |
+subpaths
 #select
-| test.cpp:43:31:43:36 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | tainted | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (argv) |
-| test.cpp:44:31:44:36 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:44:38:44:63 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (argv) |
-| test.cpp:46:31:46:36 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:46:38:46:63 | ... + ... | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (argv) |
-| test.cpp:49:25:49:30 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | size | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (argv) |
-| test.cpp:50:17:50:30 | new[] | test.cpp:40:21:40:24 | argv | test.cpp:50:26:50:29 | size | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (argv) |
-| test.cpp:53:21:53:27 | call to realloc | test.cpp:40:21:40:24 | argv | test.cpp:53:35:53:60 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (argv) |
-| test.cpp:128:17:128:22 | call to malloc | test.cpp:124:18:124:23 | call to getenv | test.cpp:128:24:128:41 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:124:18:124:23 | call to getenv | user input (getenv) |
-| test.cpp:135:3:135:8 | call to malloc | test.cpp:133:19:133:24 | call to getenv | test.cpp:135:10:135:27 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:133:19:133:24 | call to getenv | user input (getenv) |
-| test.cpp:152:4:152:9 | call to malloc | test.cpp:148:20:148:25 | call to getenv | test.cpp:152:11:152:28 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:148:20:148:25 | call to getenv | user input (getenv) |
-| test.cpp:225:14:225:19 | call to malloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:225:21:225:21 | s | This allocation size is derived from $@ and might overflow | test.cpp:237:24:237:29 | call to getenv | user input (getenv) |
-| test.cpp:231:14:231:19 | call to malloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:231:21:231:21 | s | This allocation size is derived from $@ and might overflow | test.cpp:237:24:237:29 | call to getenv | user input (getenv) |
-| test.cpp:239:2:239:7 | call to malloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:239:9:239:18 | local_size | This allocation size is derived from $@ and might overflow | test.cpp:237:24:237:29 | call to getenv | user input (getenv) |
-| test.cpp:241:2:241:7 | call to malloc | test.cpp:211:14:211:19 | call to getenv | test.cpp:241:9:241:24 | call to get_tainted_size | This allocation size is derived from $@ and might overflow | test.cpp:211:14:211:19 | call to getenv | user input (getenv) |
-| test.cpp:263:4:263:9 | call to malloc | test.cpp:259:20:259:25 | call to getenv | test.cpp:263:11:263:29 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:259:20:259:25 | call to getenv | user input (getenv) |
-| test.cpp:291:4:291:9 | call to malloc | test.cpp:251:18:251:23 | call to getenv | test.cpp:291:11:291:28 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:251:18:251:23 | call to getenv | user input (getenv) |
-| test.cpp:308:3:308:8 | call to malloc | test.cpp:251:18:251:23 | call to getenv | test.cpp:308:10:308:27 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:251:18:251:23 | call to getenv | user input (getenv) |
+| test.cpp:43:31:43:36 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:43:38:43:44 | tainted | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (a command-line argument) |
+| test.cpp:44:31:44:36 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:44:38:44:63 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (a command-line argument) |
+| test.cpp:46:31:46:36 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:46:38:46:63 | ... + ... | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (a command-line argument) |
+| test.cpp:49:25:49:30 | call to malloc | test.cpp:40:21:40:24 | argv | test.cpp:49:32:49:35 | size | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (a command-line argument) |
+| test.cpp:50:17:50:30 | new[] | test.cpp:40:21:40:24 | argv | test.cpp:50:26:50:29 | size | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (a command-line argument) |
+| test.cpp:53:21:53:27 | call to realloc | test.cpp:40:21:40:24 | argv | test.cpp:53:35:53:60 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:40:21:40:24 | argv | user input (a command-line argument) |
+| test.cpp:128:17:128:22 | call to malloc | test.cpp:124:18:124:23 | call to getenv | test.cpp:128:24:128:41 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:124:18:124:23 | call to getenv | user input (an environment variable) |
+| test.cpp:135:3:135:8 | call to malloc | test.cpp:133:19:133:24 | call to getenv | test.cpp:135:10:135:27 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:133:19:133:24 | call to getenv | user input (an environment variable) |
+| test.cpp:152:4:152:9 | call to malloc | test.cpp:148:20:148:25 | call to getenv | test.cpp:152:11:152:28 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:148:20:148:25 | call to getenv | user input (an environment variable) |
+| test.cpp:225:14:225:19 | call to malloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:225:21:225:21 | s | This allocation size is derived from $@ and might overflow | test.cpp:237:24:237:29 | call to getenv | user input (an environment variable) |
+| test.cpp:231:14:231:19 | call to malloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:231:21:231:21 | s | This allocation size is derived from $@ and might overflow | test.cpp:237:24:237:29 | call to getenv | user input (an environment variable) |
+| test.cpp:239:2:239:7 | call to malloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:239:9:239:18 | local_size | This allocation size is derived from $@ and might overflow | test.cpp:237:24:237:29 | call to getenv | user input (an environment variable) |
+| test.cpp:241:2:241:7 | call to malloc | test.cpp:211:14:211:19 | call to getenv | test.cpp:241:9:241:24 | call to get_tainted_size | This allocation size is derived from $@ and might overflow | test.cpp:211:14:211:19 | call to getenv | user input (an environment variable) |
+| test.cpp:263:4:263:9 | call to malloc | test.cpp:259:20:259:25 | call to getenv | test.cpp:263:11:263:29 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:259:20:259:25 | call to getenv | user input (an environment variable) |
+| test.cpp:291:4:291:9 | call to malloc | test.cpp:251:18:251:23 | call to getenv | test.cpp:291:11:291:28 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:251:18:251:23 | call to getenv | user input (an environment variable) |
+| test.cpp:308:3:308:8 | call to malloc | test.cpp:251:18:251:23 | call to getenv | test.cpp:308:10:308:27 | ... * ... | This allocation size is derived from $@ and might overflow | test.cpp:251:18:251:23 | call to getenv | user input (an environment variable) |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-326/InsufficientKeySize.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-326/InsufficientKeySize.expected
new file mode 100644
index 00000000000..ca20f65bec7
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-326/InsufficientKeySize.expected
@@ -0,0 +1,10 @@
+edges
+nodes
+| test.cpp:34:45:34:48 | 1024 | semmle.label | 1024 |
+| test.cpp:35:49:35:52 | 1024 | semmle.label | 1024 |
+| test.cpp:37:43:37:46 | 1024 | semmle.label | 1024 |
+subpaths
+#select
+| test.cpp:34:5:34:38 | call to EVP_PKEY_CTX_set_dsa_paramgen_bits | test.cpp:34:45:34:48 | 1024 | test.cpp:34:45:34:48 | 1024 | The key size $@ is less than the recommended key size of 2048 bits. | test.cpp:34:45:34:48 | 1024 | 1024 |
+| test.cpp:35:5:35:42 | call to EVP_PKEY_CTX_set_dh_paramgen_prime_len | test.cpp:35:49:35:52 | 1024 | test.cpp:35:49:35:52 | 1024 | The key size $@ is less than the recommended key size of 2048 bits. | test.cpp:35:49:35:52 | 1024 | 1024 |
+| test.cpp:37:5:37:36 | call to EVP_PKEY_CTX_set_rsa_keygen_bits | test.cpp:37:43:37:46 | 1024 | test.cpp:37:43:37:46 | 1024 | The key size $@ is less than the recommended key size of 2048 bits. | test.cpp:37:43:37:46 | 1024 | 1024 |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-326/InsufficientKeySize.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-326/InsufficientKeySize.qlref
new file mode 100644
index 00000000000..e869f87150a
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-326/InsufficientKeySize.qlref
@@ -0,0 +1 @@
+Security/CWE/CWE-326/InsufficientKeySize.ql
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-326/test.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-326/test.cpp
new file mode 100644
index 00000000000..18780fc05c0
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-326/test.cpp
@@ -0,0 +1,38 @@
+
+
+typedef int EVP_CIPHER;
+typedef int EVP_MD;
+
+const EVP_CIPHER *EVP_aes_128_ctr();
+const EVP_CIPHER *EVP_aes_192_ctr();
+const EVP_CIPHER *EVP_aes_256_ctr();
+
+const EVP_MD *EVP_sha224();
+const EVP_MD *EVP_sha256();
+const EVP_MD *EVP_sha384();
+const EVP_MD *EVP_sha512();
+
+
+class EVP_PKEY_CTX;
+
+ // int is a curve ID rather than a bit width
+int EVP_PKEY_CTX_set_ec_paramgen_curve_nid(EVP_PKEY_CTX*, int);
+
+int EVP_PKEY_CTX_set_dsa_paramgen_bits(EVP_PKEY_CTX*, int);
+int EVP_PKEY_CTX_set_dh_paramgen_prime_len(EVP_PKEY_CTX*, int);
+
+// RSA sets bits per-key rather than with parameters
+int EVP_PKEY_CTX_set_rsa_keygen_bits(EVP_PKEY_CTX*, int);
+
+void test1(EVP_PKEY_CTX *ctx) {
+    EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, 2048);
+    EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, 2048);
+    // RSA sets bits per-key rather than with parameters
+    EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048);
+
+    // low key sizes
+    EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, 1024);
+    EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, 1024);
+    // RSA sets bits per-key rather than with parameters
+    EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 1024);
+}
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.c b/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.c
index 82c860c6e9b..fcda0b8087a 100644
--- a/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.c	
+++ b/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.c	
@@ -1,4 +1,4 @@
-
+// semmle-extractor-options: -std=c11
 int f1(void) {
     int x = 1;
     return 2;
@@ -99,3 +99,9 @@ int f14()
 {
 	__asm__("rdtsc"); // GOOD
 }
+
+_Noreturn void f15();
+
+int f16() {
+    f15(); // GOOD
+}
diff --git a/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.cpp b/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.cpp
index 875c9ec4f75..c68ad23805c 100644
--- a/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.cpp	
+++ b/cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.cpp	
@@ -1,4 +1,4 @@
-
+// semmle-extractor-options: -std=c++11
 class MyValue {
 public:
 	MyValue(int _val) : val(_val) {};
@@ -164,3 +164,9 @@ int g19(int x)
 
 	return x; // GOOD
 }
+
+[[noreturn]] void g20();
+
+int g21() {
+    g20(); // GOOD
+}
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs
index eab6df32c65..304c8a68b6f 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs
@@ -51,7 +51,7 @@ namespace Semmle.Autobuild.CSharp.Tests
 
         int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory, IDictionary<string, string>? env, out IList<string> stdOut)
         {
-            var pattern = cmd + " " + args;
+            var pattern = string.IsNullOrEmpty(args) ? cmd : cmd + " " + args;
             RunProcessIn.Add(pattern);
 
             if (!RunProcessOut.TryGetValue(pattern, out var str))
@@ -62,7 +62,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             RunProcessWorkingDirectory.TryGetValue(pattern, out var wd);
 
             if (wd != workingDirectory)
-                throw new ArgumentException("Missing RunProcessWorkingDirectory " + pattern);
+                throw new ArgumentException($"Unexpected RunProcessWorkingDirectory, got {wd ?? "null"} expected {workingDirectory ?? "null"} in {pattern}");
 
             if (!RunProcess.TryGetValue(pattern, out var ret))
                 throw new ArgumentException("Missing RunProcess " + pattern);
@@ -72,12 +72,12 @@ namespace Semmle.Autobuild.CSharp.Tests
 
         int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory, IDictionary<string, string>? env)
         {
-            var pattern = cmd + " " + args;
+            var pattern = string.IsNullOrEmpty(args) ? cmd : cmd + " " + args;
             RunProcessIn.Add(pattern);
             RunProcessWorkingDirectory.TryGetValue(pattern, out var wd);
 
             if (wd != workingDirectory)
-                throw new ArgumentException("Missing RunProcessWorkingDirectory " + pattern);
+                throw new ArgumentException($"Unexpected RunProcessWorkingDirectory, got {wd ?? "null"} expected {workingDirectory ?? "null"} in {pattern}");
 
             if (!RunProcess.TryGetValue(pattern, out var ret))
                 throw new ArgumentException("Missing RunProcess " + pattern);
@@ -255,7 +255,7 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestAnd1()
         {
-            var cmd = BuildScript.Create("abc", "def ghi", false, null, null) & BuildScript.Create("odasa", null, false, null, null);
+            var cmd = BuildScript.Create("abc", "def ghi", false, null, null) & BuildScript.Create("codeql", null, false, null, null);
 
             actions.RunProcess["abc def ghi"] = 1;
             cmd.Run(actions, StartCallback, EndCallback);
@@ -269,14 +269,14 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestAnd2()
         {
-            var cmd = BuildScript.Create("odasa", null, false, null, null) & BuildScript.Create("abc", "def ghi", false, null, null);
+            var cmd = BuildScript.Create("codeql", null, false, null, null) & BuildScript.Create("abc", "def ghi", false, null, null);
 
             actions.RunProcess["abc def ghi"] = 1;
-            actions.RunProcess["odasa "] = 0;
+            actions.RunProcess["codeql"] = 0;
             cmd.Run(actions, StartCallback, EndCallback);
 
-            Assert.Equal("odasa ", actions.RunProcessIn[0]);
-            Assert.Equal("odasa ", startCallbackIn[0]);
+            Assert.Equal("codeql", actions.RunProcessIn[0]);
+            Assert.Equal("codeql", startCallbackIn[0]);
             Assert.Equal("", endCallbackIn[0]);
             Assert.Equal(0, endCallbackReturn[0]);
 
@@ -289,14 +289,14 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestOr1()
         {
-            var cmd = BuildScript.Create("odasa", null, false, null, null) | BuildScript.Create("abc", "def ghi", false, null, null);
+            var cmd = BuildScript.Create("codeql", null, false, null, null) | BuildScript.Create("abc", "def ghi", false, null, null);
 
             actions.RunProcess["abc def ghi"] = 1;
-            actions.RunProcess["odasa "] = 0;
+            actions.RunProcess["codeql"] = 0;
             cmd.Run(actions, StartCallback, EndCallback);
 
-            Assert.Equal("odasa ", actions.RunProcessIn[0]);
-            Assert.Equal("odasa ", startCallbackIn[0]);
+            Assert.Equal("codeql", actions.RunProcessIn[0]);
+            Assert.Equal("codeql", startCallbackIn[0]);
             Assert.Equal("", endCallbackIn[0]);
             Assert.Equal(0, endCallbackReturn[0]);
             Assert.Equal(1, endCallbackReturn.Count);
@@ -305,10 +305,10 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestOr2()
         {
-            var cmd = BuildScript.Create("abc", "def ghi", false, null, null) | BuildScript.Create("odasa", null, false, null, null);
+            var cmd = BuildScript.Create("abc", "def ghi", false, null, null) | BuildScript.Create("codeql", null, false, null, null);
 
             actions.RunProcess["abc def ghi"] = 1;
-            actions.RunProcess["odasa "] = 0;
+            actions.RunProcess["codeql"] = 0;
             cmd.Run(actions, StartCallback, EndCallback);
 
             Assert.Equal("abc def ghi", actions.RunProcessIn[0]);
@@ -316,8 +316,8 @@ namespace Semmle.Autobuild.CSharp.Tests
             Assert.Equal("", endCallbackIn[0]);
             Assert.Equal(1, endCallbackReturn[0]);
 
-            Assert.Equal("odasa ", actions.RunProcessIn[1]);
-            Assert.Equal("odasa ", startCallbackIn[1]);
+            Assert.Equal("codeql", actions.RunProcessIn[1]);
+            Assert.Equal("codeql", startCallbackIn[1]);
             Assert.Equal("", endCallbackIn[1]);
             Assert.Equal(0, endCallbackReturn[1]);
         }
@@ -385,9 +385,6 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.GetEnvironmentVariable[$"CODEQL_EXTRACTOR_{codeqlUpperLanguage}_ROOT"] = $@"C:\codeql\{codeqlUpperLanguage.ToLowerInvariant()}";
             actions.GetEnvironmentVariable["CODEQL_JAVA_HOME"] = @"C:\codeql\tools\java";
             actions.GetEnvironmentVariable["CODEQL_PLATFORM"] = isWindows ? "win64" : "linux64";
-            actions.GetEnvironmentVariable["SEMMLE_DIST"] = @"C:\odasa";
-            actions.GetEnvironmentVariable["SEMMLE_JAVA_HOME"] = @"C:\odasa\tools\java";
-            actions.GetEnvironmentVariable["SEMMLE_PLATFORM_TOOLS"] = @"C:\odasa\tools";
             actions.GetEnvironmentVariable["LGTM_INDEX_VSTOOLS_VERSION"] = vsToolsVersion;
             actions.GetEnvironmentVariable["LGTM_INDEX_MSBUILD_ARGUMENTS"] = msBuildArguments;
             actions.GetEnvironmentVariable["LGTM_INDEX_MSBUILD_PLATFORM"] = msBuildPlatform;
@@ -416,7 +413,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.RunProcess["cmd.exe /C dotnet --info"] = 0;
             actions.RunProcess[@"cmd.exe /C dotnet clean C:\Project\test.csproj"] = 0;
             actions.RunProcess[@"cmd.exe /C dotnet restore C:\Project\test.csproj"] = 0;
-            actions.RunProcess[@"cmd.exe /C C:\odasa\tools\odasa index --auto dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project\test.csproj"] = 0;
+            actions.RunProcess[@"cmd.exe /C dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project\test.csproj"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project\test.csproj"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
@@ -443,7 +440,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.RunProcess["dotnet --info"] = 0;
             actions.RunProcess[@"dotnet clean C:\Project/test.csproj"] = 0;
             actions.RunProcess[@"dotnet restore C:\Project/test.csproj"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj"] = 0;
+            actions.RunProcess[@"dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project/test.csproj"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
@@ -601,7 +598,7 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestLinuxBuildCommand()
         {
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto ""./build.sh --skip-tests"""] = 0;
+            actions.RunProcess["./build.sh --skip-tests"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"] = "";
@@ -622,8 +619,8 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"] = "";
             actions.RunProcess[@"/bin/chmod u+x C:\Project/build/build.sh"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto C:\Project/build/build.sh"] = 0;
-            actions.RunProcessWorkingDirectory[@"C:\odasa/tools/odasa index --auto C:\Project/build/build.sh"] = @"C:\Project/build";
+            actions.RunProcess[@"C:\Project/build/build.sh"] = 0;
+            actions.RunProcessWorkingDirectory[@"C:\Project/build/build.sh"] = @"C:\Project/build";
             actions.FileExists["csharp.log"] = true;
 
             var autobuilder = CreateAutoBuilder(false);
@@ -639,8 +636,8 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"] = "";
 
             actions.RunProcess[@"/bin/chmod u+x C:\Project/build.sh"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto C:\Project/build.sh"] = 0;
-            actions.RunProcessWorkingDirectory[@"C:\odasa/tools/odasa index --auto C:\Project/build.sh"] = @"C:\Project";
+            actions.RunProcess[@"C:\Project/build.sh"] = 0;
+            actions.RunProcessWorkingDirectory[@"C:\Project/build.sh"] = @"C:\Project";
             actions.FileExists["csharp.log"] = false;
 
             var autobuilder = CreateAutoBuilder(false);
@@ -656,8 +653,8 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"] = "";
 
             actions.RunProcess[@"/bin/chmod u+x C:\Project/build.sh"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto C:\Project/build.sh"] = 5;
-            actions.RunProcessWorkingDirectory[@"C:\odasa/tools/odasa index --auto C:\Project/build.sh"] = @"C:\Project";
+            actions.RunProcess[@"C:\Project/build.sh"] = 5;
+            actions.RunProcessWorkingDirectory[@"C:\Project/build.sh"] = @"C:\Project";
             actions.FileExists["csharp.log"] = true;
 
             var autobuilder = CreateAutoBuilder(false);
@@ -671,8 +668,8 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.EnumerateDirectories[@"C:\Project"] = "";
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"] = "";
-            actions.RunProcess[@"cmd.exe /C C:\odasa\tools\odasa index --auto C:\Project\build.bat"] = 0;
-            actions.RunProcessWorkingDirectory[@"cmd.exe /C C:\odasa\tools\odasa index --auto C:\Project\build.bat"] = @"C:\Project";
+            actions.RunProcess[@"cmd.exe /C C:\Project\build.bat"] = 0;
+            actions.RunProcessWorkingDirectory[@"cmd.exe /C C:\Project\build.bat"] = @"C:\Project";
             actions.FileExists["csharp.log"] = true;
 
             var autobuilder = CreateAutoBuilder(true);
@@ -686,10 +683,10 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.EnumerateDirectories[@"C:\Project"] = "";
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"] = "";
-            actions.RunProcess[@"cmd.exe /C C:\odasa\tools\odasa index --auto C:\Project\build.bat"] = 1;
-            actions.RunProcessWorkingDirectory[@"cmd.exe /C C:\odasa\tools\odasa index --auto C:\Project\build.bat"] = @"C:\Project";
+            actions.RunProcess[@"cmd.exe /C C:\Project\build.bat"] = 1;
+            actions.RunProcessWorkingDirectory[@"cmd.exe /C C:\Project\build.bat"] = @"C:\Project";
             actions.RunProcess[@"cmd.exe /C C:\codeql\tools\java\bin\java -jar C:\codeql\csharp\tools\extractor-asp.jar ."] = 0;
-            actions.RunProcess[@"cmd.exe /C C:\odasa\tools\odasa index --xml --extensions config"] = 0;
+            actions.RunProcess[@"cmd.exe /C C:\codeql\tools\codeql index --xml --extensions config"] = 0;
             actions.FileExists["csharp.log"] = true;
 
             var autobuilder = CreateAutoBuilder(true, ignoreErrors: "true");
@@ -699,9 +696,9 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestWindowsCmdIgnoreErrors()
         {
-            actions.RunProcess["cmd.exe /C C:\\odasa\\tools\\odasa index --auto ^\"build.cmd --skip-tests^\""] = 3;
+            actions.RunProcess["cmd.exe /C ^\"build.cmd --skip-tests^\""] = 3;
             actions.RunProcess[@"cmd.exe /C C:\codeql\tools\java\bin\java -jar C:\codeql\csharp\tools\extractor-asp.jar ."] = 0;
-            actions.RunProcess[@"cmd.exe /C C:\odasa\tools\odasa index --xml --extensions config"] = 0;
+            actions.RunProcess[@"cmd.exe /C C:\codeql\tools\codeql index --xml --extensions config"] = 0;
             actions.FileExists["csharp.log"] = true;
             SkipVsWhere();
 
@@ -718,9 +715,9 @@ namespace Semmle.Autobuild.CSharp.Tests
         public void TestWindowCSharpMsBuild()
         {
             actions.RunProcess[@"cmd.exe /C C:\Project\.nuget\nuget.exe restore C:\Project\test1.sln -DisableParallelProcessing"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test1.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test1.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
             actions.RunProcess[@"cmd.exe /C C:\Project\.nuget\nuget.exe restore C:\Project\test2.sln -DisableParallelProcessing"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test2.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test2.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"] = false;
             actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"] = false;
@@ -749,9 +746,9 @@ namespace Semmle.Autobuild.CSharp.Tests
         public void TestWindowCSharpMsBuildMultipleSolutions()
         {
             actions.RunProcess[@"cmd.exe /C nuget restore C:\Project\test1.csproj -DisableParallelProcessing"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test1.csproj /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test1.csproj /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
             actions.RunProcess[@"cmd.exe /C nuget restore C:\Project\test2.csproj -DisableParallelProcessing"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test2.csproj /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test2.csproj /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project\test1.csproj"] = true;
             actions.FileExists[@"C:\Project\test2.csproj"] = true;
@@ -794,7 +791,7 @@ namespace Semmle.Autobuild.CSharp.Tests
         public void TestWindowCSharpMsBuildFailed()
         {
             actions.RunProcess[@"cmd.exe /C nuget restore C:\Project\test1.sln -DisableParallelProcessing"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test1.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 1;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test1.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 1;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"] = false;
             actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"] = false;
@@ -820,8 +817,8 @@ namespace Semmle.Autobuild.CSharp.Tests
         [Fact]
         public void TestSkipNugetMsBuild()
         {
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test1.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\test2.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test1.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\test2.sln /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"] = false;
             actions.FileExists[@"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"] = false;
@@ -865,7 +862,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.RunProcess["dotnet --info"] = 0;
             actions.RunProcess[@"dotnet clean C:\Project/test.csproj"] = 0;
             actions.RunProcess[@"dotnet restore C:\Project/test.csproj"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto dotnet build --no-incremental /p:UseSharedCompilation=false --no-restore C:\Project/test.csproj"] = 0;
+            actions.RunProcess[@"dotnet build --no-incremental /p:UseSharedCompilation=false --no-restore C:\Project/test.csproj"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project/test.csproj"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
@@ -897,7 +894,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.RunProcess[@"C:\Project/.dotnet/dotnet --info"] = 0;
             actions.RunProcess[@"C:\Project/.dotnet/dotnet clean C:\Project/test.csproj"] = 0;
             actions.RunProcess[@"C:\Project/.dotnet/dotnet restore C:\Project/test.csproj"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto C:\Project/.dotnet/dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj"] = 0;
+            actions.RunProcess[@"C:\Project/.dotnet/dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists["test.csproj"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
@@ -932,7 +929,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.RunProcess[@"C:\Project/.dotnet/dotnet --info"] = 0;
             actions.RunProcess[@"C:\Project/.dotnet/dotnet clean C:\Project/test.csproj"] = 0;
             actions.RunProcess[@"C:\Project/.dotnet/dotnet restore C:\Project/test.csproj"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto C:\Project/.dotnet/dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj"] = 0;
+            actions.RunProcess[@"C:\Project/.dotnet/dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists["test.csproj"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
@@ -963,7 +960,7 @@ namespace Semmle.Autobuild.CSharp.Tests
             actions.RunProcess[@"cmd.exe /C C:\Project\.dotnet\dotnet --info"] = 0;
             actions.RunProcess[@"cmd.exe /C C:\Project\.dotnet\dotnet clean C:\Project\test.csproj"] = 0;
             actions.RunProcess[@"cmd.exe /C C:\Project\.dotnet\dotnet restore C:\Project\test.csproj"] = 0;
-            actions.RunProcess[@"cmd.exe /C C:\odasa\tools\odasa index --auto C:\Project\.dotnet\dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project\test.csproj"] = 0;
+            actions.RunProcess[@"cmd.exe /C C:\Project\.dotnet\dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project\test.csproj"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project\test.csproj"] = true;
             actions.GetEnvironmentVariable["CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"] = "";
@@ -1011,7 +1008,7 @@ namespace Semmle.Autobuild.CSharp.Tests
         {
             actions.RunProcess[@"cmd.exe /C nuget restore C:\Project\dirs.proj -DisableParallelProcessing"] = 1;
             actions.RunProcess[@"cmd.exe /C C:\Project\.nuget\nuget.exe restore C:\Project\dirs.proj -DisableParallelProcessing"] = 0;
-            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && C:\\odasa\\tools\\odasa index --auto msbuild C:\\Project\\dirs.proj /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
+            actions.RunProcess["cmd.exe /C CALL ^\"C:\\Program Files ^(x86^)\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\Project\\dirs.proj /p:UseSharedCompilation=false /t:Windows /p:Platform=\"x86\" /p:Configuration=\"Debug\" /p:MvcBuildViews=true /P:Fu=Bar"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project\a\test.csproj"] = true;
             actions.FileExists[@"C:\Project\dirs.proj"] = true;
@@ -1055,7 +1052,7 @@ namespace Semmle.Autobuild.CSharp.Tests
         {
             actions.RunProcess[@"nuget restore C:\Project/dirs.proj -DisableParallelProcessing"] = 1;
             actions.RunProcess[@"mono C:\Project/.nuget/nuget.exe restore C:\Project/dirs.proj -DisableParallelProcessing"] = 0;
-            actions.RunProcess[@"C:\odasa/tools/odasa index --auto msbuild C:\Project/dirs.proj /p:UseSharedCompilation=false /t:rebuild /p:MvcBuildViews=true"] = 0;
+            actions.RunProcess[@"msbuild C:\Project/dirs.proj /p:UseSharedCompilation=false /t:rebuild /p:MvcBuildViews=true"] = 0;
             actions.FileExists["csharp.log"] = true;
             actions.FileExists[@"C:\Project/a/test.csproj"] = true;
             actions.FileExists[@"C:\Project/dirs.proj"] = true;
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs b/csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs
index 3d7a1168e30..18603809d34 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs
@@ -240,7 +240,7 @@ namespace Semmle.Autobuild.CSharp
         private static BuildScript GetBuildScript(Autobuilder builder, string? dotNetPath, IDictionary<string, string>? environment, string projOrSln)
         {
             var build = new CommandBuilder(builder.Actions, null, environment);
-            var script = builder.MaybeIndex(build, DotNetCommand(builder.Actions, dotNetPath)).
+            var script = build.RunCommand(DotNetCommand(builder.Actions, dotNetPath)).
                 Argument("build").
                 Argument("--no-incremental");
 
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp/StandaloneBuildRule.cs b/csharp/autobuilder/Semmle.Autobuild.CSharp/StandaloneBuildRule.cs
index e98f94f3b44..fa6523e37ae 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp/StandaloneBuildRule.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp/StandaloneBuildRule.cs
@@ -17,10 +17,6 @@ namespace Semmle.Autobuild.CSharp
                 {
                     standalone = builder.Actions.PathCombine(builder.CodeQLExtractorLangRoot, "tools", builder.CodeQlPlatform, "Semmle.Extraction.CSharp.Standalone");
                 }
-                else if (builder.SemmlePlatformTools is not null)
-                {
-                    standalone = builder.Actions.PathCombine(builder.SemmlePlatformTools, "csharp", "Semmle.Extraction.CSharp.Standalone");
-                }
                 else
                 {
                     return BuildScript.Failure;
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
index 408672f7b97..d90175d245a 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
@@ -190,19 +190,15 @@ namespace Semmle.Autobuild.Shared
             });
 
             CodeQLExtractorLangRoot = Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_ROOT");
-            SemmlePlatformTools = Actions.GetEnvironmentVariable("SEMMLE_PLATFORM_TOOLS");
-
             CodeQlPlatform = Actions.GetEnvironmentVariable("CODEQL_PLATFORM");
 
             TrapDir =
                 Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR") ??
-                Actions.GetEnvironmentVariable("TRAP_FOLDER") ??
-                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR or TRAP_FOLDER has not been set.");
+                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR has not been set.");
 
             SourceArchiveDir =
                 Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR") ??
-                Actions.GetEnvironmentVariable("SOURCE_ARCHIVE") ??
-                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR or SOURCE_ARCHIVE has not been set.");
+                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR has not been set.");
         }
 
         protected string TrapDir { get; }
@@ -264,34 +260,9 @@ namespace Semmle.Autobuild.Shared
         /// </summary>
         public string? CodeQLExtractorLangRoot { get; }
 
-        /// <summary>
-        /// Value of SEMMLE_PLATFORM_TOOLS environment variable.
-        /// </summary>
-        public string? SemmlePlatformTools { get; }
-
         /// <summary>
         /// Value of CODEQL_PLATFORM environment variable.
         /// </summary>
         public string? CodeQlPlatform { get; }
-
-        /// <summary>
-        /// The absolute path of the odasa executable.
-        /// null if we are running in CodeQL.
-        /// </summary>
-        public string? Odasa
-        {
-            get
-            {
-                var semmleDist = Actions.GetEnvironmentVariable("SEMMLE_DIST");
-                return semmleDist is null ? null : Actions.PathCombine(semmleDist, "tools", "odasa");
-            }
-        }
-
-        /// <summary>
-        /// Construct a command that executed the given <paramref name="cmd"/> wrapped in
-        /// an <code>odasa --index</code>, unless indexing has been disabled, in which case
-        /// <paramref name="cmd"/> is run directly.
-        /// </summary>
-        public CommandBuilder MaybeIndex(CommandBuilder builder, string cmd) => Odasa is null ? builder.RunCommand(cmd) : builder.IndexCommand(Odasa, cmd);
     }
 }
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandAutoRule.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandAutoRule.cs
index fbb109f0b4c..b6cb0737630 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandAutoRule.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandAutoRule.cs
@@ -58,7 +58,7 @@ namespace Semmle.Autobuild.Shared
                 if (vsTools is not null)
                     command.CallBatFile(vsTools.Path);
 
-                builder.MaybeIndex(command, scriptPath);
+                command.RunCommand(scriptPath);
                 return command.Script;
             });
         }
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandRule.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandRule.cs
index 453d3c4f9ad..6db4cfa139d 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandRule.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandRule.cs
@@ -26,7 +26,7 @@
                     var vsTools = MsBuildRule.GetVcVarsBatFile(builder);
                     if (vsTools is not null)
                         command.CallBatFile(vsTools.Path);
-                    builder.MaybeIndex(command, builder.Options.BuildCommand);
+                    command.RunCommand(builder.Options.BuildCommand);
 
                     return command.Script;
                 });
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildScript.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildScript.cs
index 679db860c49..9840d63c5e4 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildScript.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildScript.cs
@@ -70,7 +70,7 @@ namespace Semmle.Autobuild.Shared
                 this.environment = environment;
             }
 
-            public override string ToString() => exe + " " + arguments;
+            public override string ToString() => arguments.Length > 0 ? exe + " " + arguments : exe;
 
             public override int Run(IBuildActions actions, Action<string, bool> startCallback, Action<int, string, bool> exitCallBack)
             {
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/CommandBuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/CommandBuilder.cs
index e3b7bdbab34..2064380772f 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/CommandBuilder.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/CommandBuilder.cs
@@ -45,11 +45,6 @@ namespace Semmle.Autobuild.Shared
             this.silent = silent;
         }
 
-        private void OdasaIndex(string odasa)
-        {
-            RunCommand(odasa, "index --auto");
-        }
-
         public CommandBuilder CallBatFile(string batFile, string? argumentsOpt = null)
         {
             NextCommand();
@@ -59,21 +54,6 @@ namespace Semmle.Autobuild.Shared
             return this;
         }
 
-        /// <summary>
-        /// Perform odasa index on a given command or BAT file.
-        /// </summary>
-        /// <param name="odasa">The odasa executable.</param>
-        /// <param name="command">The command to run.</param>
-        /// <param name="argumentsOpt">Additional arguments.</param>
-        /// <returns>this for chaining calls.</returns>
-        public CommandBuilder IndexCommand(string odasa, string command, string? argumentsOpt = null)
-        {
-            OdasaIndex(odasa);
-            QuoteArgument(command);
-            Argument(argumentsOpt);
-            return this;
-        }
-
         private static readonly char[] specialChars = { ' ', '\t', '\n', '\v', '\"' };
         private static readonly char[] cmdMetacharacter = { '(', ')', '%', '!', '^', '\"', '<', '>', '&', '|' };
 
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs
index 1a938f81a32..55dbf31ba1b 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs
@@ -95,7 +95,7 @@ namespace Semmle.Autobuild.Shared
                     command.RunCommand("set Platform=&& type NUL", quoteExe: false);
                 }
 
-                builder.MaybeIndex(command, msBuild);
+                command.RunCommand(msBuild);
                 command.QuoteArgument(projectOrSolution.FullPath);
 
                 command.Argument("/p:UseSharedCompilation=false");
diff --git a/csharp/config/tracer/linux/csharp-compiler-settings b/csharp/config/tracer/linux/csharp-compiler-settings
deleted file mode 100644
index f62c33a450b..00000000000
--- a/csharp/config/tracer/linux/csharp-compiler-settings
+++ /dev/null
@@ -1,14 +0,0 @@
-**/mcs.exe:
-**/csc.exe:
-  invoke ${env.SEMMLE_PLATFORM_TOOLS}/csharp/Semmle.Extraction.CSharp.Driver
-  prepend --compiler
-  prepend "${compiler}"
-  prepend --cil
-**/mono*:
-**/dotnet:
-  invoke ${odasa_tools}/extract-csharp.sh
-**/msbuild:
-**/xbuild:
-  replace yes
-  invoke ${compiler}
-  append /p:UseSharedCompilation=false
diff --git a/csharp/config/tracer/linux/extract-csharp.sh b/csharp/config/tracer/linux/extract-csharp.sh
deleted file mode 100755
index 00bf654d792..00000000000
--- a/csharp/config/tracer/linux/extract-csharp.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-echo extract-csharp.sh: Called with arguments: "$@"
-
-extractor=$SEMMLE_PLATFORM_TOOLS/csharp/Semmle.Extraction.CSharp.Driver
-
-for i in "$@"
-do
-  shift
-  if [[ `basename -- "$i"` =~ csc.exe|mcs.exe|csc.dll ]]
-  then
-    echo extract-csharp.sh: exec $extractor --cil $@
-    exec "$extractor" --compiler $i --cil $@
-  fi
-done
-
-echo extract-csharp.sh: Not a compiler invocation
diff --git a/csharp/config/tracer/windows/csharp-compiler-settings b/csharp/config/tracer/windows/csharp-compiler-settings
deleted file mode 100644
index 24ffb8e37a3..00000000000
--- a/csharp/config/tracer/windows/csharp-compiler-settings
+++ /dev/null
@@ -1,9 +0,0 @@
-**\fakes*.exe:
-**\moles*.exe:
-  order compiler
-  trace no
-**\csc*.exe:
-  invoke ${env.SEMMLE_PLATFORM_TOOLS}\csharp\Semmle.Extraction.CSharp.Driver.exe
-  prepend --compiler
-  prepend "${compiler}"
-  prepend --cil
diff --git a/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs b/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs
index 9e72f560854..b4664103962 100644
--- a/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs
+++ b/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs
@@ -20,11 +20,11 @@ namespace Semmle.Extraction.CIL.Driver
             Console.WriteLine("    path       A directory/dll/exe to analyze");
         }
 
-        private static void ExtractAssembly(Layout layout, string assemblyPath, ILogger logger, CommonOptions options)
+        private static void ExtractAssembly(string assemblyPath, ILogger logger, CommonOptions options)
         {
             var sw = new Stopwatch();
             sw.Start();
-            Analyser.ExtractCIL(layout, assemblyPath, logger, options, out _, out _);
+            Analyser.ExtractCIL(assemblyPath, logger, options, out _, out _);
             sw.Stop();
             logger.Log(Severity.Info, "  {0} ({1})", assemblyPath, sw.Elapsed);
         }
@@ -38,12 +38,11 @@ namespace Semmle.Extraction.CIL.Driver
             }
 
             var options = new ExtractorOptions(args);
-            var layout = new Layout();
             using var logger = new ConsoleLogger(options.Verbosity);
 
             var actions = options.AssembliesToExtract
                 .Select(asm => asm.Filename)
-                .Select<string, Action>(filename => () => ExtractAssembly(layout, filename, logger, options))
+                .Select<string, Action>(filename => () => ExtractAssembly(filename, logger, options))
                 .ToArray();
 
             foreach (var missingRef in options.MissingReferences)
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Analyser.cs b/csharp/extractor/Semmle.Extraction.CIL/Analyser.cs
index e78843148af..e5b78592fb3 100644
--- a/csharp/extractor/Semmle.Extraction.CIL/Analyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CIL/Analyser.cs
@@ -25,7 +25,7 @@ namespace Semmle.Extraction.CIL
         /// <param name="extractPdbs">Whether to extract PDBs.</param>
         /// <param name="trapFile">The path of the trap file.</param>
         /// <param name="extracted">Whether the file was extracted (false=cached).</param>
-        public static void ExtractCIL(Layout layout, string assemblyPath, ILogger logger, CommonOptions options, out string trapFile, out bool extracted)
+        public static void ExtractCIL(string assemblyPath, ILogger logger, CommonOptions options, out string trapFile, out bool extracted)
         {
             trapFile = "";
             extracted = false;
@@ -35,8 +35,7 @@ namespace Semmle.Extraction.CIL
                 var pathTransformer = new PathTransformer(canonicalPathCache);
                 var extractor = new TracingExtractor(assemblyPath, logger, pathTransformer, options);
                 var transformedAssemblyPath = pathTransformer.Transform(assemblyPath);
-                var project = layout.LookupProjectOrDefault(transformedAssemblyPath);
-                using var trapWriter = project.CreateTrapWriter(logger, transformedAssemblyPath.WithSuffix(".cil"), options.TrapCompression, discardDuplicates: true);
+                using var trapWriter = transformedAssemblyPath.WithSuffix(".cil").CreateTrapWriter(logger, options.TrapCompression, discardDuplicates: true);
                 trapFile = trapWriter.TrapFile;
                 if (!options.Cache || !System.IO.File.Exists(trapFile))
                 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
new file mode 100644
index 00000000000..97a25d200f7
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Semmle.Util;
+using Semmle.Util.Logging;
+
+namespace Semmle.Extraction.CSharp.Standalone
+{
+    public static class Extractor
+    {
+
+        private static IEnumerable<Action> GetResolvedReferencesStandalone(IEnumerable<string> referencePaths, BlockingCollection<MetadataReference> references)
+        {
+            return referencePaths.Select<string, Action>(path => () =>
+            {
+                var reference = MetadataReference.CreateFromFile(path);
+                references.Add(reference);
+            });
+        }
+
+        private static void AnalyseStandalone(
+            StandaloneAnalyser analyser,
+            IEnumerable<string> sources,
+            IEnumerable<string> referencePaths,
+            CommonOptions options,
+            IProgressMonitor progressMonitor,
+            Stopwatch stopwatch)
+        {
+            CSharp.Extractor.Analyse(stopwatch, analyser, options,
+                references => GetResolvedReferencesStandalone(referencePaths, references),
+                (analyser, syntaxTrees) => CSharp.Extractor.ReadSyntaxTrees(sources, analyser, null, null, syntaxTrees),
+                (syntaxTrees, references) => CSharpCompilation.Create("csharp.dll", syntaxTrees, references),
+                (compilation, options) => analyser.Initialize(compilation, options),
+                () => { },
+                _ => { },
+                () =>
+                {
+                    foreach (var type in analyser.MissingNamespaces)
+                    {
+                        progressMonitor.MissingNamespace(type);
+                    }
+
+                    foreach (var type in analyser.MissingTypes)
+                    {
+                        progressMonitor.MissingType(type);
+                    }
+
+                    progressMonitor.MissingSummary(analyser.MissingTypes.Count(), analyser.MissingNamespaces.Count());
+                });
+        }
+
+        private static void ExtractStandalone(
+            IEnumerable<string> sources,
+            IEnumerable<string> referencePaths,
+            IProgressMonitor pm,
+            ILogger logger,
+            CommonOptions options)
+        {
+            var stopwatch = new Stopwatch();
+            stopwatch.Start();
+
+            var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
+            var pathTransformer = new PathTransformer(canonicalPathCache);
+
+            using var analyser = new StandaloneAnalyser(pm, logger, false, pathTransformer);
+            try
+            {
+                AnalyseStandalone(analyser, sources, referencePaths, options, pm, stopwatch);
+            }
+            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
+            {
+                analyser.Logger.Log(Severity.Error, "  Unhandled exception: {0}", ex);
+            }
+        }
+
+        private class ExtractionProgress : IProgressMonitor
+        {
+            public ExtractionProgress(ILogger output)
+            {
+                logger = output;
+            }
+
+            private readonly ILogger logger;
+
+            public void Analysed(int item, int total, string source, string output, TimeSpan time, AnalysisAction action)
+            {
+                logger.Log(Severity.Info, "[{0}/{1}] {2} ({3})", item, total, source,
+                    action == AnalysisAction.Extracted
+                        ? time.ToString()
+                        : action == AnalysisAction.Excluded
+                            ? "excluded"
+                            : "up to date");
+            }
+
+            public void MissingType(string type)
+            {
+                logger.Log(Severity.Debug, "Missing type {0}", type);
+            }
+
+            public void MissingNamespace(string @namespace)
+            {
+                logger.Log(Severity.Info, "Missing namespace {0}", @namespace);
+            }
+
+            public void MissingSummary(int missingTypes, int missingNamespaces)
+            {
+                logger.Log(Severity.Info, "Failed to resolve {0} types in {1} namespaces", missingTypes, missingNamespaces);
+            }
+        }
+
+        public static ExitCode Run(Options options)
+        {
+            var stopwatch = new Stopwatch();
+            stopwatch.Start();
+
+            using var logger = new ConsoleLogger(options.Verbosity);
+            logger.Log(Severity.Info, "Running C# standalone extractor");
+            using var a = new Analysis(logger, options);
+            var sourceFileCount = a.Extraction.Sources.Count;
+
+            if (sourceFileCount == 0)
+            {
+                logger.Log(Severity.Error, "No source files found");
+                return ExitCode.Errors;
+            }
+
+            if (!options.SkipExtraction)
+            {
+                using var fileLogger = CSharp.Extractor.MakeLogger(options.Verbosity, false);
+
+                logger.Log(Severity.Info, "");
+                logger.Log(Severity.Info, "Extracting...");
+                ExtractStandalone(
+                    a.Extraction.Sources,
+                    a.References,
+                    new ExtractionProgress(logger),
+                    fileLogger,
+                    options);
+                logger.Log(Severity.Info, $"Extraction completed in {stopwatch.Elapsed}");
+            }
+
+            return ExitCode.Ok;
+        }
+    }
+}
\ No newline at end of file
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs
index e2c973ee60f..6266eb09f93 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Semmle.BuildAnalyser;
 using Semmle.Util.Logging;
 
@@ -52,11 +53,10 @@ namespace Semmle.Extraction.CSharp.Standalone
     {
         public static int Main(string[] args)
         {
-            Extractor.SetInvariantCulture();
+            CSharp.Extractor.SetInvariantCulture();
 
             var options = Options.Create(args);
             // options.CIL = true;  // To do: Enable this
-            using var output = new ConsoleLogger(options.Verbosity);
 
             if (options.Help)
             {
@@ -67,69 +67,7 @@ namespace Semmle.Extraction.CSharp.Standalone
             if (options.Errors)
                 return 1;
 
-            var start = DateTime.Now;
-
-            output.Log(Severity.Info, "Running C# standalone extractor");
-            using var a = new Analysis(output, options);
-            var sourceFileCount = a.Extraction.Sources.Count;
-
-            if (sourceFileCount == 0)
-            {
-                output.Log(Severity.Error, "No source files found");
-                return 1;
-            }
-
-            if (!options.SkipExtraction)
-            {
-                using var fileLogger = new FileLogger(options.Verbosity, Extractor.GetCSharpLogPath());
-
-                output.Log(Severity.Info, "");
-                output.Log(Severity.Info, "Extracting...");
-                Extractor.ExtractStandalone(
-                    a.Extraction.Sources,
-                    a.References,
-                    new ExtractionProgress(output),
-                    fileLogger,
-                    options);
-                output.Log(Severity.Info, $"Extraction completed in {DateTime.Now - start}");
-            }
-
-            return 0;
-        }
-
-        private class ExtractionProgress : IProgressMonitor
-        {
-            public ExtractionProgress(ILogger output)
-            {
-                logger = output;
-            }
-
-            private readonly ILogger logger;
-
-            public void Analysed(int item, int total, string source, string output, TimeSpan time, AnalysisAction action)
-            {
-                logger.Log(Severity.Info, "[{0}/{1}] {2} ({3})", item, total, source,
-                    action == AnalysisAction.Extracted
-                        ? time.ToString()
-                        : action == AnalysisAction.Excluded
-                            ? "excluded"
-                            : "up to date");
-            }
-
-            public void MissingType(string type)
-            {
-                logger.Log(Severity.Debug, "Missing type {0}", type);
-            }
-
-            public void MissingNamespace(string @namespace)
-            {
-                logger.Log(Severity.Info, "Missing namespace {0}", @namespace);
-            }
-
-            public void MissingSummary(int missingTypes, int missingNamespaces)
-            {
-                logger.Log(Severity.Info, "Failed to resolve {0} types in {1} namespaces", missingTypes, missingNamespaces);
-            }
+            return (int)Extractor.Run(options);
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Runtime.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Runtime.cs
index 1fbe016fc76..4b76efc3d65 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Runtime.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Runtime.cs
@@ -84,7 +84,7 @@ namespace Semmle.Extraction.CSharp.Standalone
                 foreach (var r in DesktopRuntimes)
                     yield return r;
 
-                // A bad choice if it's the self-contained runtime distributed in odasa dist.
+                // A bad choice if it's the self-contained runtime distributed in codeql dist.
                 yield return ExecutingRuntime;
             }
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/StandaloneAnalyser.cs
similarity index 87%
rename from csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
rename to csharp/extractor/Semmle.Extraction.CSharp.Standalone/StandaloneAnalyser.cs
index 9173ab35217..310f7eb1553 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/StandaloneAnalyser.cs
@@ -11,10 +11,9 @@ namespace Semmle.Extraction.CSharp
         {
         }
 
-        public void InitializeStandalone(CSharpCompilation compilationIn, CommonOptions options)
+        public void Initialize(CSharpCompilation compilationIn, CommonOptions options)
         {
             compilation = compilationIn;
-            layout = new Layout();
             extractor = new StandaloneExtractor(Logger, PathTransformer, options);
             this.options = options;
             LogExtractorInfo(Extraction.Extractor.Version);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
index 336a76ffbdc..a2b7669c3bb 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
@@ -18,7 +18,6 @@ namespace Semmle.Extraction.CSharp
     {
         protected Extraction.Extractor? extractor;
         protected CSharpCompilation? compilation;
-        protected Layout? layout;
         protected CommonOptions? options;
 
         private readonly object progressMutex = new object();
@@ -125,8 +124,7 @@ namespace Semmle.Extraction.CSharp
 
                 var assemblyPath = r.FilePath!;
                 var transformedAssemblyPath = PathTransformer.Transform(assemblyPath);
-                var projectLayout = layout.LookupProjectOrDefault(transformedAssemblyPath);
-                using var trapWriter = projectLayout.CreateTrapWriter(Logger, transformedAssemblyPath, options.TrapCompression, discardDuplicates: true);
+                using var trapWriter = transformedAssemblyPath.CreateTrapWriter(Logger, options.TrapCompression, discardDuplicates: true);
 
                 var skipExtraction = options.Cache && File.Exists(trapWriter.TrapFile);
 
@@ -178,7 +176,7 @@ namespace Semmle.Extraction.CSharp
         {
             var stopwatch = new Stopwatch();
             stopwatch.Start();
-            CIL.Analyser.ExtractCIL(layout, r.FilePath!, Logger, options, out var trapFile, out var extracted);
+            CIL.Analyser.ExtractCIL(r.FilePath!, Logger, options, out var trapFile, out var extracted);
             stopwatch.Stop();
             ReportProgress(r.FilePath, trapFile, stopwatch.Elapsed, extracted ? AnalysisAction.Extracted : AnalysisAction.UpToDate);
         }
@@ -192,44 +190,35 @@ namespace Semmle.Extraction.CSharp
                 var sourcePath = tree.FilePath;
                 var transformedSourcePath = PathTransformer.Transform(sourcePath);
 
-                var projectLayout = layout.LookupProjectOrNull(transformedSourcePath);
-                var excluded = projectLayout is null;
-                var trapPath = excluded ? "" : projectLayout!.GetTrapPath(Logger, transformedSourcePath, options.TrapCompression);
+                var trapPath = transformedSourcePath.GetTrapPath(Logger, options.TrapCompression);
                 var upToDate = false;
 
-                if (!excluded)
+                // compilation.Clone() is used to allow symbols to be garbage collected.
+                using var trapWriter = transformedSourcePath.CreateTrapWriter(Logger, options.TrapCompression, discardDuplicates: false);
+
+                upToDate = options.Fast && FileIsUpToDate(sourcePath, trapWriter.TrapFile);
+
+                if (!upToDate)
                 {
-                    // compilation.Clone() is used to allow symbols to be garbage collected.
-                    using var trapWriter = projectLayout!.CreateTrapWriter(Logger, transformedSourcePath, options.TrapCompression, discardDuplicates: false);
+                    var cx = new Context(extractor, compilation.Clone(), trapWriter, new SourceScope(tree), addAssemblyTrapPrefix);
+                    // Ensure that the file itself is populated in case the source file is totally empty
+                    var root = tree.GetRoot();
+                    Entities.File.Create(cx, root.SyntaxTree.FilePath);
 
-                    upToDate = options.Fast && FileIsUpToDate(sourcePath, trapWriter.TrapFile);
-
-                    if (!upToDate)
+                    var csNode = (CSharpSyntaxNode)root;
+                    var directiveVisitor = new DirectiveVisitor(cx);
+                    csNode.Accept(directiveVisitor);
+                    foreach (var branch in directiveVisitor.BranchesTaken)
                     {
-                        var cx = new Context(extractor, compilation.Clone(), trapWriter, new SourceScope(tree), addAssemblyTrapPrefix);
-                        // Ensure that the file itself is populated in case the source file is totally empty
-                        var root = tree.GetRoot();
-                        Entities.File.Create(cx, root.SyntaxTree.FilePath);
-
-                        var csNode = (CSharpSyntaxNode)root;
-                        var directiveVisitor = new DirectiveVisitor(cx);
-                        csNode.Accept(directiveVisitor);
-                        foreach (var branch in directiveVisitor.BranchesTaken)
-                        {
-                            cx.TrapStackSuffix.Add(branch);
-                        }
-                        csNode.Accept(new CompilationUnitVisitor(cx));
-                        cx.PopulateAll();
-                        CommentPopulator.ExtractCommentBlocks(cx, cx.CommentGenerator);
-                        cx.PopulateAll();
+                        cx.TrapStackSuffix.Add(branch);
                     }
+                    csNode.Accept(new CompilationUnitVisitor(cx));
+                    cx.PopulateAll();
+                    CommentPopulator.ExtractCommentBlocks(cx, cx.CommentGenerator);
+                    cx.PopulateAll();
                 }
 
-                ReportProgress(sourcePath, trapPath, stopwatch.Elapsed, excluded
-                    ? AnalysisAction.Excluded
-                    : upToDate
-                        ? AnalysisAction.UpToDate
-                        : AnalysisAction.Extracted);
+                ReportProgress(sourcePath, trapPath, stopwatch.Elapsed, upToDate ? AnalysisAction.UpToDate : AnalysisAction.Extracted);
             }
             catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
index 25829a35068..8d63c6288bf 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -16,15 +16,15 @@ using System.Threading;
 
 namespace Semmle.Extraction.CSharp
 {
+    public enum ExitCode
+    {
+        Ok,         // Everything worked perfectly
+        Errors,     // Trap was generated but there were processing errors
+        Failed      // Trap could not be generated
+    }
+
     public static class Extractor
     {
-        public enum ExitCode
-        {
-            Ok,         // Everything worked perfectly
-            Errors,     // Trap was generated but there were processing errors
-            Failed      // Trap could not be generated
-        }
-
         private class LogProgressMonitor : IProgressMonitor
         {
             private readonly ILogger logger;
@@ -69,6 +69,14 @@ namespace Semmle.Extraction.CSharp
             Thread.CurrentThread.CurrentUICulture = culture;
         }
 
+        public static ILogger MakeLogger(Verbosity verbosity, bool includeConsole)
+        {
+            var fileLogger = new FileLogger(verbosity, GetCSharpLogPath());
+            return includeConsole
+                ? new CombinedLogger(new ConsoleLogger(verbosity), fileLogger)
+                : (ILogger)fileLogger;
+        }
+
         /// <summary>
         /// Command-line driver for the extractor.
         /// </summary>
@@ -89,10 +97,7 @@ namespace Semmle.Extraction.CSharp
             var options = Options.CreateWithEnvironment(args);
             Entities.Compilation.Settings = (Directory.GetCurrentDirectory(), options.CompilerArguments.ToArray());
 
-            var fileLogger = new FileLogger(options.Verbosity, GetCSharpLogPath());
-            using var logger = options.Console
-                ? new CombinedLogger(new ConsoleLogger(options.Verbosity), fileLogger)
-                : (ILogger)fileLogger;
+            using var logger = MakeLogger(options.Verbosity, options.Console);
 
             if (Environment.GetEnvironmentVariable("SEMMLE_CLRTRACER") == "1" && !options.ClrTracer)
             {
@@ -276,7 +281,7 @@ namespace Semmle.Extraction.CSharp
         /// The constructed syntax trees will be added (thread-safely) to the supplied
         /// list <paramref name="ret"/>.
         /// </summary>
-        private static IEnumerable<Action> ReadSyntaxTrees(IEnumerable<string> sources, Analyser analyser, CSharpParseOptions? parseOptions, Encoding? encoding, IList<SyntaxTree> ret)
+        public static IEnumerable<Action> ReadSyntaxTrees(IEnumerable<string> sources, Analyser analyser, CSharpParseOptions? parseOptions, Encoding? encoding, IList<SyntaxTree> ret)
         {
             return sources.Select<string, Action>(path => () =>
             {
@@ -298,31 +303,7 @@ namespace Semmle.Extraction.CSharp
             });
         }
 
-        public static void ExtractStandalone(
-            IEnumerable<string> sources,
-            IEnumerable<string> referencePaths,
-            IProgressMonitor pm,
-            ILogger logger,
-            CommonOptions options)
-        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-
-            var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
-            var pathTransformer = new PathTransformer(canonicalPathCache);
-
-            using var analyser = new StandaloneAnalyser(pm, logger, false, pathTransformer);
-            try
-            {
-                AnalyseStandalone(analyser, sources, referencePaths, options, pm, stopwatch);
-            }
-            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
-            {
-                analyser.Logger.Log(Severity.Error, "  Unhandled exception: {0}", ex);
-            }
-        }
-
-        private static ExitCode Analyse(Stopwatch stopwatch, Analyser analyser, CommonOptions options,
+        public static ExitCode Analyse(Stopwatch stopwatch, Analyser analyser, CommonOptions options,
             Func<BlockingCollection<MetadataReference>, IEnumerable<Action>> getResolvedReferenceTasks,
             Func<Analyser, List<SyntaxTree>, IEnumerable<Action>> getSyntaxTreeTasks,
             Func<IEnumerable<SyntaxTree>, IEnumerable<MetadataReference>, CSharpCompilation> getCompilation,
@@ -395,37 +376,6 @@ namespace Semmle.Extraction.CSharp
             return analyser.TotalErrors == 0 ? ExitCode.Ok : ExitCode.Errors;
         }
 
-        private static void AnalyseStandalone(
-            StandaloneAnalyser analyser,
-            IEnumerable<string> sources,
-            IEnumerable<string> referencePaths,
-            CommonOptions options,
-            IProgressMonitor progressMonitor,
-            Stopwatch stopwatch)
-        {
-            Analyse(stopwatch, analyser, options,
-                references => GetResolvedReferencesStandalone(referencePaths, references),
-                (analyser, syntaxTrees) => ReadSyntaxTrees(sources, analyser, null, null, syntaxTrees),
-                (syntaxTrees, references) => CSharpCompilation.Create("csharp.dll", syntaxTrees, references),
-                (compilation, options) => analyser.InitializeStandalone(compilation, options),
-                () => { },
-                _ => { },
-                () =>
-                {
-                    foreach (var type in analyser.MissingNamespaces)
-                    {
-                        progressMonitor.MissingNamespace(type);
-                    }
-
-                    foreach (var type in analyser.MissingTypes)
-                    {
-                        progressMonitor.MissingType(type);
-                    }
-
-                    progressMonitor.MissingSummary(analyser.MissingTypes.Count(), analyser.MissingNamespaces.Count());
-                });
-        }
-
         private static ExitCode AnalyseTracing(
             TracingAnalyser analyser,
             CSharpCommandLineArguments compilerArguments,
@@ -468,15 +418,6 @@ namespace Semmle.Extraction.CSharp
                 () => { });
         }
 
-        private static IEnumerable<Action> GetResolvedReferencesStandalone(IEnumerable<string> referencePaths, BlockingCollection<MetadataReference> references)
-        {
-            return referencePaths.Select<string, Action>(path => () =>
-            {
-                var reference = MetadataReference.CreateFromFile(path);
-                references.Add(reference);
-            });
-        }
-
         /// <summary>
         /// Gets the path to the `csharp.log` file written to by the C# extractor.
         /// </summary>
@@ -511,19 +452,6 @@ namespace Semmle.Extraction.CSharp
             if (!string.IsNullOrEmpty(codeQlLogDir))
                 return codeQlLogDir;
 
-            var snapshot = Environment.GetEnvironmentVariable("ODASA_SNAPSHOT");
-            if (!string.IsNullOrEmpty(snapshot))
-                return Path.Combine(snapshot, "log");
-
-            var buildErrorDir = Environment.GetEnvironmentVariable("ODASA_BUILD_ERROR_DIR");
-            if (!string.IsNullOrEmpty(buildErrorDir))
-                // Used by `qltest`
-                return buildErrorDir;
-
-            var traps = Environment.GetEnvironmentVariable("TRAP_FOLDER");
-            if (!string.IsNullOrEmpty(traps))
-                return traps;
-
             return Directory.GetCurrentDirectory();
         }
     }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs
index 8501e1a0e42..7b4e0e95ea3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs
@@ -40,8 +40,7 @@ namespace Semmle.Extraction.CSharp
         public static Options CreateWithEnvironment(string[] arguments)
         {
             var options = new Options();
-            var extractionOptions = Environment.GetEnvironmentVariable("SEMMLE_EXTRACTOR_OPTIONS") ??
-                Environment.GetEnvironmentVariable("LGTM_INDEX_EXTRACTOR");
+            var extractionOptions = Environment.GetEnvironmentVariable("LGTM_INDEX_EXTRACTOR");
 
             var argsList = new List<string>(arguments);
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
index 4c15d053a93..8681ded3f09 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
@@ -46,7 +46,6 @@ namespace Semmle.Extraction.CSharp
         {
             if (!init)
                 throw new InternalError("EndInitialize called without BeginInitialize returning true");
-            this.layout = new Layout();
             this.options = options;
             this.compilation = compilation;
             this.extractor = new TracingExtractor(GetOutputName(compilation, commandLineArguments), Logger, PathTransformer, options);
@@ -202,8 +201,7 @@ namespace Semmle.Extraction.CSharp
                 var assemblyPath = ((TracingExtractor?)extractor).OutputPath;
                 var transformedAssemblyPath = PathTransformer.Transform(assemblyPath);
                 var assembly = compilation.Assembly;
-                var projectLayout = layout.LookupProjectOrDefault(transformedAssemblyPath);
-                var trapWriter = projectLayout.CreateTrapWriter(Logger, transformedAssemblyPath, options.TrapCompression, discardDuplicates: false);
+                var trapWriter = transformedAssemblyPath.CreateTrapWriter(Logger, options.TrapCompression, discardDuplicates: false);
                 compilationTrapFile = trapWriter;  // Dispose later
                 var cx = new Context(extractor, compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);
 
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Layout.cs b/csharp/extractor/Semmle.Extraction.Tests/Layout.cs
deleted file mode 100644
index 58470fa8caa..00000000000
--- a/csharp/extractor/Semmle.Extraction.Tests/Layout.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-using System.IO;
-using Xunit;
-using Semmle.Util.Logging;
-using System.Runtime.InteropServices;
-
-namespace Semmle.Extraction.Tests
-{
-    internal struct TransformedPathStub : PathTransformer.ITransformedPath
-    {
-        private readonly string value;
-        public TransformedPathStub(string value) => this.value = value;
-        public string Value => value;
-
-        public string Extension => throw new System.NotImplementedException();
-
-        public string NameWithoutExtension => throw new System.NotImplementedException();
-
-        public PathTransformer.ITransformedPath ParentDirectory => throw new System.NotImplementedException();
-
-        public string DatabaseId => throw new System.NotImplementedException();
-
-        public PathTransformer.ITransformedPath WithSuffix(string suffix)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-
-    public class Layout
-    {
-        private readonly ILogger logger = new LoggerMock();
-
-        [Fact]
-        public void TestDefaultLayout()
-        {
-            var layout = new Semmle.Extraction.Layout(null, null, null);
-            var project = layout.LookupProjectOrNull(new TransformedPathStub("foo.cs"));
-
-            Assert.NotNull(project);
-
-            // All files are mapped when there's no layout file.
-            Assert.True(layout.FileInLayout(new TransformedPathStub("foo.cs")));
-
-            // Test trap filename
-            var tmpDir = Path.GetTempPath();
-            Directory.SetCurrentDirectory(tmpDir);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                // `Directory.SetCurrentDirectory()` seems to slightly change the path on macOS,
-                // so adjusting it:
-                Assert.NotEqual(Directory.GetCurrentDirectory(), tmpDir);
-                tmpDir = "/private" + tmpDir;
-                // Remove trailing slash:
-                Assert.Equal('/', tmpDir[tmpDir.Length - 1]);
-                tmpDir = tmpDir.Substring(0, tmpDir.Length - 1);
-                Assert.Equal(Directory.GetCurrentDirectory(), tmpDir);
-            }
-            var f1 = project!.GetTrapPath(logger, new TransformedPathStub("foo.cs"), TrapWriter.CompressionMode.Gzip);
-            var g1 = TrapWriter.NestPaths(logger, tmpDir, "foo.cs.trap.gz");
-            Assert.Equal(f1, g1);
-
-            // Test trap file generation
-            var trapwriterFilename = project.GetTrapPath(logger, new TransformedPathStub("foo.cs"), TrapWriter.CompressionMode.Gzip);
-            using (var trapwriter = project.CreateTrapWriter(logger, new TransformedPathStub("foo.cs"), TrapWriter.CompressionMode.Gzip, discardDuplicates: false))
-            {
-                trapwriter.Emit("1=*");
-                Assert.False(File.Exists(trapwriterFilename));
-            }
-            Assert.True(File.Exists(trapwriterFilename));
-            File.Delete(trapwriterFilename);
-        }
-
-        [Fact]
-        public void TestLayoutFile()
-        {
-            File.WriteAllLines("layout.txt", new string[]
-            {
-                "# Section",
-                "TRAP_FOLDER=" + Path.GetFullPath("snapshot\\trap"),
-                "ODASA_DB=snapshot\\db-csharp",
-                "SOURCE_ARCHIVE=" + Path.GetFullPath("snapshot\\archive"),
-                "ODASA_BUILD_ERROR_DIR=snapshot\build-errors",
-                "-foo.cs",
-                "bar.cs",
-                "-excluded",
-                "excluded/foo.cs",
-                "included"
-            });
-
-            var layout = new Semmle.Extraction.Layout(null, null, "layout.txt");
-
-            // Test general pattern matching
-            Assert.True(layout.FileInLayout(new TransformedPathStub("bar.cs")));
-            Assert.False(layout.FileInLayout(new TransformedPathStub("foo.cs")));
-            Assert.False(layout.FileInLayout(new TransformedPathStub("goo.cs")));
-            Assert.False(layout.FileInLayout(new TransformedPathStub("excluded/bar.cs")));
-            Assert.True(layout.FileInLayout(new TransformedPathStub("excluded/foo.cs")));
-            Assert.True(layout.FileInLayout(new TransformedPathStub("included/foo.cs")));
-
-            // Test the trap file
-            var project = layout.LookupProjectOrNull(new TransformedPathStub("bar.cs"));
-            Assert.NotNull(project);
-            var trapwriterFilename = project!.GetTrapPath(logger, new TransformedPathStub("bar.cs"), TrapWriter.CompressionMode.Gzip);
-            Assert.Equal(TrapWriter.NestPaths(logger, Path.GetFullPath("snapshot\\trap"), "bar.cs.trap.gz"),
-                trapwriterFilename);
-
-            // Test the source archive
-            var trapWriter = project.CreateTrapWriter(logger, new TransformedPathStub("bar.cs"), TrapWriter.CompressionMode.Gzip, discardDuplicates: false);
-            trapWriter.Archive("layout.txt", new TransformedPathStub("layout.txt"), System.Text.Encoding.ASCII);
-            var writtenFile = TrapWriter.NestPaths(logger, Path.GetFullPath("snapshot\\archive"), "layout.txt");
-            Assert.True(File.Exists(writtenFile));
-            File.Delete("layout.txt");
-        }
-
-        [Fact]
-        public void TestTrapOverridesLayout()
-        {
-            // When you specify both a trap file and a layout, use the trap file.
-            var layout = new Semmle.Extraction.Layout(Path.GetFullPath("snapshot\\trap"), null, "something.txt");
-            Assert.True(layout.FileInLayout(new TransformedPathStub("bar.cs")));
-            var subProject = layout.LookupProjectOrNull(new TransformedPathStub("foo.cs"));
-            Assert.NotNull(subProject);
-            var f1 = subProject!.GetTrapPath(logger, new TransformedPathStub("foo.cs"), TrapWriter.CompressionMode.Gzip);
-            var g1 = TrapWriter.NestPaths(logger, Path.GetFullPath("snapshot\\trap"), "foo.cs.trap.gz");
-            Assert.Equal(f1, g1);
-        }
-
-        [Fact]
-        public void TestMultipleSections()
-        {
-            File.WriteAllLines("layout.txt", new string[]
-            {
-                "# Section 1",
-                "TRAP_FOLDER=" + Path.GetFullPath("snapshot\\trap1"),
-                "ODASA_DB=snapshot\\db-csharp",
-                "SOURCE_ARCHIVE=" + Path.GetFullPath("snapshot\\archive1"),
-                "ODASA_BUILD_ERROR_DIR=snapshot\build-errors",
-                "foo.cs",
-                "# Section 2",
-                "TRAP_FOLDER=" + Path.GetFullPath("snapshot\\trap2"),
-                "ODASA_DB=snapshot\\db-csharp",
-                "SOURCE_ARCHIVE=" + Path.GetFullPath("snapshot\\archive2"),
-                "ODASA_BUILD_ERROR_DIR=snapshot\build-errors",
-                "bar.cs",
-            });
-
-            var layout = new Semmle.Extraction.Layout(null, null, "layout.txt");
-
-            // Use Section 2
-            Assert.True(layout.FileInLayout(new TransformedPathStub("bar.cs")));
-            var subProject = layout.LookupProjectOrNull(new TransformedPathStub("bar.cs"));
-            Assert.NotNull(subProject);
-            var f1 = subProject!.GetTrapPath(logger, new TransformedPathStub("bar.cs"), TrapWriter.CompressionMode.Gzip);
-            var g1 = TrapWriter.NestPaths(logger, Path.GetFullPath("snapshot\\trap2"), "bar.cs.trap.gz");
-            Assert.Equal(f1, g1);
-
-            // Use Section 1
-            Assert.True(layout.FileInLayout(new TransformedPathStub("foo.cs")));
-            subProject = layout.LookupProjectOrNull(new TransformedPathStub("foo.cs"));
-            Assert.NotNull(subProject);
-            var f2 = subProject!.GetTrapPath(logger, new TransformedPathStub("foo.cs"), TrapWriter.CompressionMode.Gzip);
-            var g2 = TrapWriter.NestPaths(logger, Path.GetFullPath("snapshot\\trap1"), "foo.cs.trap.gz");
-            Assert.Equal(f2, g2);
-
-            // boo.dll is not in the layout, so use layout from first section.
-            Assert.False(layout.FileInLayout(new TransformedPathStub("boo.dll")));
-            var f3 = layout.LookupProjectOrDefault(new TransformedPathStub("boo.dll")).GetTrapPath(logger, new TransformedPathStub("boo.dll"), TrapWriter.CompressionMode.Gzip);
-            var g3 = TrapWriter.NestPaths(logger, Path.GetFullPath("snapshot\\trap1"), "boo.dll.trap.gz");
-            Assert.Equal(f3, g3);
-
-            // boo.cs is not in the layout, so return null
-            Assert.False(layout.FileInLayout(new TransformedPathStub("boo.cs")));
-            Assert.Null(layout.LookupProjectOrNull(new TransformedPathStub("boo.cs")));
-        }
-
-        [Fact]
-        public void MissingLayout()
-        {
-            Assert.Throws<Extraction.Layout.InvalidLayoutException>(() =>
-               new Semmle.Extraction.Layout(null, null, "nosuchfile.txt"));
-        }
-
-        [Fact]
-        public void EmptyLayout()
-        {
-            File.Create("layout.txt").Close();
-            Assert.Throws<Extraction.Layout.InvalidLayoutException>(() =>
-                new Semmle.Extraction.Layout(null, null, "layout.txt"));
-        }
-
-        [Fact]
-        public void InvalidLayout()
-        {
-            File.WriteAllLines("layout.txt", new string[]
-            {
-                "# Section 1"
-            });
-
-            Assert.Throws<Extraction.Layout.InvalidLayoutException>(() =>
-                new Semmle.Extraction.Layout(null, null, "layout.txt"));
-        }
-
-        private sealed class LoggerMock : ILogger
-        {
-            public void Dispose() { }
-
-            public void Log(Severity s, string text) { }
-        }
-    }
-
-    internal static class TrapWriterTestExtensions
-    {
-        public static void Emit(this TrapWriter trapFile, string s)
-        {
-            trapFile.Emit(new StringTrapEmitter(s));
-        }
-
-        private class StringTrapEmitter : ITrapEmitter
-        {
-            private readonly string content;
-            public StringTrapEmitter(string content)
-            {
-                this.content = content;
-            }
-
-            public void EmitTrap(TextWriter trapFile)
-            {
-                trapFile.Write(content);
-            }
-        }
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Options.cs b/csharp/extractor/Semmle.Extraction.Tests/Options.cs
index 8ad9d3de027..9b17320fbaa 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/Options.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/Options.cs
@@ -14,7 +14,6 @@ namespace Semmle.Extraction.Tests
 
         public OptionsTests()
         {
-            Environment.SetEnvironmentVariable("SEMMLE_EXTRACTOR_OPTIONS", "");
             Environment.SetEnvironmentVariable("LGTM_INDEX_EXTRACTOR", "");
         }
 
@@ -126,14 +125,14 @@ namespace Semmle.Extraction.Tests
         [Fact]
         public void EnvironmentVariables()
         {
-            Environment.SetEnvironmentVariable("SEMMLE_EXTRACTOR_OPTIONS", "--cil c");
+            Environment.SetEnvironmentVariable("LGTM_INDEX_EXTRACTOR", "--cil c");
             options = CSharp.Options.CreateWithEnvironment(new string[] { "a", "b" });
             Assert.True(options.CIL);
             Assert.Equal("a", options.CompilerArguments[0]);
             Assert.Equal("b", options.CompilerArguments[1]);
             Assert.Equal("c", options.CompilerArguments[2]);
 
-            Environment.SetEnvironmentVariable("SEMMLE_EXTRACTOR_OPTIONS", "");
+            Environment.SetEnvironmentVariable("LGTM_INDEX_EXTRACTOR", "");
             Environment.SetEnvironmentVariable("LGTM_INDEX_EXTRACTOR", "--nocil");
             options = CSharp.Options.CreateWithEnvironment(new string[] { "--cil" });
             Assert.False(options.CIL);
diff --git a/csharp/extractor/Semmle.Extraction/Layout.cs b/csharp/extractor/Semmle.Extraction/Layout.cs
deleted file mode 100644
index 549c49b4fb7..00000000000
--- a/csharp/extractor/Semmle.Extraction/Layout.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using Semmle.Util.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Semmle.Extraction
-{
-    /// <summary>
-    /// An extractor layout file.
-    /// Represents the layout of projects into trap folders and source archives.
-    /// </summary>
-    public sealed class Layout
-    {
-        /// <summary>
-        /// Exception thrown when the layout file is invalid.
-        /// </summary>
-        public class InvalidLayoutException : Exception
-        {
-            public InvalidLayoutException(string file, string message) :
-                base("ODASA_CSHARP_LAYOUT " + file + " " + message)
-            {
-            }
-        }
-
-        /// <summary>
-        /// List of blocks in the layout file.
-        /// </summary>
-        private readonly List<LayoutBlock> blocks;
-
-        /// <summary>
-        /// A subproject in the layout file.
-        /// </summary>
-        public class SubProject
-        {
-            /// <summary>
-            /// The trap folder, or null for current directory.
-            /// </summary>
-            public string? TRAP_FOLDER { get; }
-
-            /// <summary>
-            /// The source archive, or null to skip.
-            /// </summary>
-            public string? SOURCE_ARCHIVE { get; }
-
-            public SubProject(string? traps, string? archive)
-            {
-                TRAP_FOLDER = traps;
-                SOURCE_ARCHIVE = archive;
-            }
-
-            /// <summary>
-            /// Gets the name of the trap file for a given source/assembly file.
-            /// </summary>
-            /// <param name="srcFile">The source file.</param>
-            /// <returns>The full filepath of the trap file.</returns>
-            public string GetTrapPath(ILogger logger, PathTransformer.ITransformedPath srcFile, TrapWriter.CompressionMode trapCompression) =>
-                TrapWriter.TrapPath(logger, TRAP_FOLDER, srcFile, trapCompression);
-
-            /// <summary>
-            /// Creates a trap writer for a given source/assembly file.
-            /// </summary>
-            /// <param name="srcFile">The source file.</param>
-            /// <returns>A newly created TrapWriter.</returns>
-            public TrapWriter CreateTrapWriter(ILogger logger, PathTransformer.ITransformedPath srcFile, TrapWriter.CompressionMode trapCompression, bool discardDuplicates) =>
-                new TrapWriter(logger, srcFile, TRAP_FOLDER, SOURCE_ARCHIVE, trapCompression, discardDuplicates);
-        }
-
-        private readonly SubProject defaultProject;
-
-        /// <summary>
-        /// Finds the suitable directories for a given source file.
-        /// Returns null if not included in the layout.
-        /// </summary>
-        /// <param name="sourceFile">The file to look up.</param>
-        /// <returns>The relevant subproject, or null if not found.</returns>
-        public SubProject? LookupProjectOrNull(PathTransformer.ITransformedPath sourceFile)
-        {
-            if (!useLayoutFile)
-                return defaultProject;
-
-            return blocks
-                .Where(block => block.Matches(sourceFile))
-                .Select(block => block.Directories)
-                .FirstOrDefault();
-        }
-
-        /// <summary>
-        /// Finds the suitable directories for a given source file.
-        /// Returns the default project if not included in the layout.
-        /// </summary>
-        /// <param name="sourceFile">The file to look up.</param>
-        /// <returns>The relevant subproject, or DefaultProject if not found.</returns>
-        public SubProject LookupProjectOrDefault(PathTransformer.ITransformedPath sourceFile)
-        {
-            return LookupProjectOrNull(sourceFile) ?? defaultProject;
-        }
-
-        private readonly bool useLayoutFile;
-
-        /// <summary>
-        /// Default constructor reads parameters from the environment.
-        /// </summary>
-        public Layout() : this(
-            Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_TRAP_DIR") ?? Environment.GetEnvironmentVariable("TRAP_FOLDER"),
-            Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR") ?? Environment.GetEnvironmentVariable("SOURCE_ARCHIVE"),
-            Environment.GetEnvironmentVariable("ODASA_CSHARP_LAYOUT"))
-        {
-        }
-
-        /// <summary>
-        /// Creates the project layout. Reads the layout file if specified.
-        /// </summary>
-        /// <param name="traps">Directory for trap files, or null to use layout/current directory.</param>
-        /// <param name="archive">Directory for source archive, or null for layout/no archive.</param>
-        /// <param name="layout">Path of layout file, or null for no layout.</param>
-        /// <exception cref="InvalidLayoutException">Failed to read layout file.</exception>
-        public Layout(string? traps, string? archive, string? layout)
-        {
-            useLayoutFile = string.IsNullOrEmpty(traps) && !string.IsNullOrEmpty(layout);
-            blocks = new List<LayoutBlock>();
-
-            if (useLayoutFile)
-            {
-                ReadLayoutFile(layout!);
-                defaultProject = blocks[0].Directories;
-            }
-            else
-            {
-                defaultProject = new SubProject(traps, archive);
-            }
-        }
-
-        /// <summary>
-        /// Is the source file included in the layout?
-        /// </summary>
-        /// <param name="path">The absolute path of the file to query.</param>
-        /// <returns>True iff there is no layout file or the layout file specifies the file.</returns>
-        public bool FileInLayout(PathTransformer.ITransformedPath path) => LookupProjectOrNull(path) is not null;
-
-        private void ReadLayoutFile(string layout)
-        {
-            try
-            {
-                var lines = File.ReadAllLines(layout);
-
-                var i = 0;
-                while (!lines[i].StartsWith("#"))
-                    i++;
-                while (i < lines.Length)
-                {
-                    var block = new LayoutBlock(lines, ref i);
-                    blocks.Add(block);
-                }
-
-                if (blocks.Count == 0)
-                    throw new InvalidLayoutException(layout, "contains no blocks");
-            }
-            catch (IOException ex)
-            {
-                throw new InvalidLayoutException(layout, ex.Message);
-            }
-            catch (IndexOutOfRangeException)
-            {
-                throw new InvalidLayoutException(layout, "is invalid");
-            }
-        }
-    }
-
-    internal sealed class LayoutBlock
-    {
-        private readonly List<FilePattern> filePatterns = new List<FilePattern>();
-
-        public Layout.SubProject Directories { get; }
-
-        private static string? ReadVariable(string name, string line)
-        {
-            var prefix = name + "=";
-            if (!line.StartsWith(prefix))
-                return null;
-            return line.Substring(prefix.Length).Trim();
-        }
-
-        public LayoutBlock(string[] lines, ref int i)
-        {
-            // first line: #name
-            i++;
-            var trapFolder = ReadVariable("TRAP_FOLDER", lines[i++]);
-            // Don't care about ODASA_DB.
-            ReadVariable("ODASA_DB", lines[i++]);
-            var sourceArchive = ReadVariable("SOURCE_ARCHIVE", lines[i++]);
-
-            Directories = new Layout.SubProject(trapFolder, sourceArchive);
-            // Don't care about ODASA_BUILD_ERROR_DIR.
-            ReadVariable("ODASA_BUILD_ERROR_DIR", lines[i++]);
-            while (i < lines.Length && !lines[i].StartsWith("#"))
-            {
-                filePatterns.Add(new FilePattern(lines[i++]));
-            }
-        }
-
-        public bool Matches(PathTransformer.ITransformedPath path) => FilePattern.Matches(filePatterns, path.Value, out var _);
-    }
-}
diff --git a/csharp/extractor/Semmle.Extraction/PathTransformer.cs b/csharp/extractor/Semmle.Extraction/PathTransformer.cs
index 4611e079454..7e4ce24bdc6 100644
--- a/csharp/extractor/Semmle.Extraction/PathTransformer.cs
+++ b/csharp/extractor/Semmle.Extraction/PathTransformer.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Diagnostics.CodeAnalysis;
 using Semmle.Util;
+using Semmle.Util.Logging;
 
 namespace Semmle.Extraction
 {
@@ -35,6 +36,20 @@ namespace Semmle.Extraction
             ITransformedPath WithSuffix(string suffix);
 
             string DatabaseId { get; }
+
+            /// <summary>
+            /// Gets the name of the trap file for this file.
+            /// </summary>
+            /// <returns>The full filepath of the trap file.</returns>
+            public string GetTrapPath(ILogger logger, TrapWriter.CompressionMode trapCompression) =>
+                TrapWriter.TrapPath(logger, Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"), this, trapCompression);
+
+            /// <summary>
+            /// Creates a trap writer for this file.
+            /// </summary>
+            /// <returns>A newly created TrapWriter.</returns>
+            public TrapWriter CreateTrapWriter(ILogger logger, TrapWriter.CompressionMode trapCompression, bool discardDuplicates) =>
+                new(logger, this, Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_TRAP_DIR"), Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR"), trapCompression, discardDuplicates);
         }
 
         private struct TransformedPath : ITransformedPath
diff --git a/csharp/extractor/Semmle.Util/CanonicalPathCache.cs b/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
index 1288cf6d7b6..9b56d3e4f1f 100644
--- a/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
+++ b/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
@@ -234,9 +234,7 @@ namespace Semmle.Util
         /// <returns>A new CanonicalPathCache.</returns>
         public static CanonicalPathCache Create(ILogger logger, int maxCapacity)
         {
-            var preserveSymlinks =
-                Environment.GetEnvironmentVariable("CODEQL_PRESERVE_SYMLINKS") == "true" ||
-                Environment.GetEnvironmentVariable("SEMMLE_PRESERVE_SYMLINKS") == "true";
+            var preserveSymlinks = Environment.GetEnvironmentVariable("CODEQL_PRESERVE_SYMLINKS") == "true";
             return Create(logger, maxCapacity, preserveSymlinks ? CanonicalPathCache.Symlinks.Preserve : CanonicalPathCache.Symlinks.Follow);
 
         }
diff --git a/csharp/extractor/Semmle.Util/Logger.cs b/csharp/extractor/Semmle.Util/Logger.cs
index 5307ad0fcd9..1182046f693 100644
--- a/csharp/extractor/Semmle.Util/Logger.cs
+++ b/csharp/extractor/Semmle.Util/Logger.cs
@@ -74,7 +74,7 @@ namespace Semmle.Util.Logging
             }
             catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
             {
-                Console.Error.WriteLine("SEMMLE: Couldn't initialise C# extractor output: " + ex.Message + "\n" + ex.StackTrace);
+                Console.Error.WriteLine("CodeQL: Couldn't initialise C# extractor output: " + ex.Message + "\n" + ex.StackTrace);
                 Console.Error.Flush();
                 throw;
             }
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 229de990843..1fa8e6a97a1 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.0.5
+
 ## 1.0.4
 
 ## 1.0.3
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.0.5.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.0.5.md
new file mode 100644
index 00000000000..ac0f13f1f5e
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.0.5.md
@@ -0,0 +1 @@
+## 1.0.5
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 03f7ea71b58..42da17b3841 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.4
+lastReleaseVersion: 1.0.5
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 97b3f928fa9..2306b6e3f7a 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.0.5-dev
+version: 1.0.6-dev
 groups:
     - csharp
     - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 229de990843..1fa8e6a97a1 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.0.5
+
 ## 1.0.4
 
 ## 1.0.3
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.0.5.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.0.5.md
new file mode 100644
index 00000000000..ac0f13f1f5e
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.0.5.md
@@ -0,0 +1 @@
+## 1.0.5
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 03f7ea71b58..42da17b3841 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.4
+lastReleaseVersion: 1.0.5
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index e428de5b82d..e066d816c4b 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.0.5-dev
+version: 1.0.6-dev
 groups:
     - csharp
     - solorigate
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 193709d1260..68e312fb659 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.0.11
+
+### Breaking Changes
+
+* The C# extractor no longer supports the following legacy environment variables:
+```
+ODASA_BUILD_ERROR_DIR
+ODASA_CSHARP_LAYOUT
+ODASA_SNAPSHOT
+SEMMLE_DIST
+SEMMLE_EXTRACTOR_OPTIONS
+SEMMLE_PLATFORM_TOOLS
+SEMMLE_PRESERVE_SYMLINKS
+SOURCE_ARCHIVE
+TRAP_FOLDER
+```
+* `codeql test run` now extracts source code recursively from sub folders. This may break existing tests that have other tests in nested sub folders, as those will now get the nested test code included.
+
 ## 0.0.10
 
 ## 0.0.9
diff --git a/csharp/ql/lib/change-notes/2022-02-07-deleted-deprecations.md b/csharp/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
new file mode 100644
index 00000000000..e8da1e8e158
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* All deprecated predicates/classes/modules that have been deprecated for over a year have been deleted.
\ No newline at end of file
diff --git a/csharp/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md b/csharp/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
new file mode 100644
index 00000000000..a79f286aacd
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/csharp/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md b/csharp/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
new file mode 100644
index 00000000000..3481d507db3
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The flow state variants of `isBarrier` and `isAdditionalFlowStep` are no longer exposed in the taint tracking library. The `isSanitizer` and `isAdditionalTaintStep` predicates should be used instead.
diff --git a/csharp/ql/lib/change-notes/released/0.0.11.md b/csharp/ql/lib/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..fb37f9e3758
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/0.0.11.md
@@ -0,0 +1,17 @@
+## 0.0.11
+
+### Breaking Changes
+
+* The C# extractor no longer supports the following legacy environment variables:
+```
+ODASA_BUILD_ERROR_DIR
+ODASA_CSHARP_LAYOUT
+ODASA_SNAPSHOT
+SEMMLE_DIST
+SEMMLE_EXTRACTOR_OPTIONS
+SEMMLE_PLATFORM_TOOLS
+SEMMLE_PRESERVE_SYMLINKS
+SOURCE_ARCHIVE
+TRAP_FOLDER
+```
+* `codeql test run` now extracts source code recursively from sub folders. This may break existing tests that have other tests in nested sub folders, as those will now get the nested test code included.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 786e7dcd2aa..d17d3a6388c 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/asp/WebConfig.qll b/csharp/ql/lib/semmle/code/asp/WebConfig.qll
index 16d5393afc2..024d60ca450 100644
--- a/csharp/ql/lib/semmle/code/asp/WebConfig.qll
+++ b/csharp/ql/lib/semmle/code/asp/WebConfig.qll
@@ -7,67 +7,88 @@ import csharp
 /**
  * A `Web.config` file.
  */
-class WebConfigXML extends XMLFile {
-  WebConfigXML() { this.getName().matches("%Web.config") }
+class WebConfigXml extends XMLFile {
+  WebConfigXml() { this.getName().matches("%Web.config") }
 }
 
+/** DEPRECATED: Alias for WebConfigXml */
+deprecated class WebConfigXML = WebConfigXml;
+
 /** A `<configuration>` tag in an ASP.NET configuration file. */
-class ConfigurationXMLElement extends XMLElement {
-  ConfigurationXMLElement() { this.getName().toLowerCase() = "configuration" }
+class ConfigurationXmlElement extends XMLElement {
+  ConfigurationXmlElement() { this.getName().toLowerCase() = "configuration" }
 }
 
+/** DEPRECATED: Alias for ConfigurationXmlElement */
+deprecated class ConfigurationXMLElement = ConfigurationXmlElement;
+
 /** A `<location>` tag in an ASP.NET configuration file. */
-class LocationXMLElement extends XMLElement {
-  LocationXMLElement() {
-    this.getParent() instanceof ConfigurationXMLElement and
+class LocationXmlElement extends XMLElement {
+  LocationXmlElement() {
+    this.getParent() instanceof ConfigurationXmlElement and
     this.getName().toLowerCase() = "location"
   }
 }
 
+/** DEPRECATED: Alias for LocationXmlElement */
+deprecated class LocationXMLElement = LocationXmlElement;
+
 /** A `<system.web>` tag in an ASP.NET configuration file. */
-class SystemWebXMLElement extends XMLElement {
-  SystemWebXMLElement() {
+class SystemWebXmlElement extends XMLElement {
+  SystemWebXmlElement() {
     (
-      this.getParent() instanceof ConfigurationXMLElement
+      this.getParent() instanceof ConfigurationXmlElement
       or
-      this.getParent() instanceof LocationXMLElement
+      this.getParent() instanceof LocationXmlElement
     ) and
     this.getName().toLowerCase() = "system.web"
   }
 }
 
+/** DEPRECATED: Alias for SystemWebXmlElement */
+deprecated class SystemWebXMLElement = SystemWebXmlElement;
+
 /** A `<system.webServer>` tag in an ASP.NET configuration file. */
-class SystemWebServerXMLElement extends XMLElement {
-  SystemWebServerXMLElement() {
+class SystemWebServerXmlElement extends XMLElement {
+  SystemWebServerXmlElement() {
     (
-      this.getParent() instanceof ConfigurationXMLElement
+      this.getParent() instanceof ConfigurationXmlElement
       or
-      this.getParent() instanceof LocationXMLElement
+      this.getParent() instanceof LocationXmlElement
     ) and
     this.getName().toLowerCase() = "system.webserver"
   }
 }
 
+/** DEPRECATED: Alias for SystemWebServerXmlElement */
+deprecated class SystemWebServerXMLElement = SystemWebServerXmlElement;
+
 /** A `<customErrors>` tag in an ASP.NET configuration file. */
-class CustomErrorsXMLElement extends XMLElement {
-  CustomErrorsXMLElement() {
-    this.getParent() instanceof SystemWebXMLElement and
+class CustomErrorsXmlElement extends XMLElement {
+  CustomErrorsXmlElement() {
+    this.getParent() instanceof SystemWebXmlElement and
     this.getName().toLowerCase() = "customerrors"
   }
 }
 
+/** DEPRECATED: Alias for CustomErrorsXmlElement */
+deprecated class CustomErrorsXMLElement = CustomErrorsXmlElement;
+
 /** A `<httpRuntime>` tag in an ASP.NET configuration file. */
-class HttpRuntimeXMLElement extends XMLElement {
-  HttpRuntimeXMLElement() {
-    this.getParent() instanceof SystemWebXMLElement and
+class HttpRuntimeXmlElement extends XMLElement {
+  HttpRuntimeXmlElement() {
+    this.getParent() instanceof SystemWebXmlElement and
     this.getName().toLowerCase() = "httpruntime"
   }
 }
 
+/** DEPRECATED: Alias for HttpRuntimeXmlElement */
+deprecated class HttpRuntimeXMLElement = HttpRuntimeXmlElement;
+
 /** A `<forms>` tag under `<system.web><authentication>` in an ASP.NET configuration file. */
 class FormsElement extends XMLElement {
   FormsElement() {
-    this = any(SystemWebXMLElement sw).getAChild("authentication").getAChild("forms")
+    this = any(SystemWebXmlElement sw).getAChild("authentication").getAChild("forms")
   }
 
   /**
@@ -85,7 +106,7 @@ class FormsElement extends XMLElement {
 
 /** A `<httpCookies>` tag in an ASP.NET configuration file. */
 class HttpCookiesElement extends XMLElement {
-  HttpCookiesElement() { this = any(SystemWebXMLElement sw).getAChild("httpCookies") }
+  HttpCookiesElement() { this = any(SystemWebXmlElement sw).getAChild("httpCookies") }
 
   /**
    * Gets attribute's `httpOnlyCookies` value.
diff --git a/csharp/ql/lib/semmle/code/cil/Declaration.qll b/csharp/ql/lib/semmle/code/cil/Declaration.qll
index 178b5c9966e..9d35eeba9f9 100644
--- a/csharp/ql/lib/semmle/code/cil/Declaration.qll
+++ b/csharp/ql/lib/semmle/code/cil/Declaration.qll
@@ -23,13 +23,6 @@ class Declaration extends DotNet::Declaration, Element, @cil_declaration {
   }
 
   override Declaration getUnboundDeclaration() { result = this }
-
-  /**
-   * DEPRECATED: Use `isUnboundDeclaration()` instead.
-   *
-   * Holds if this declaration is a source declaration.
-   */
-  deprecated final predicate isSourceDeclaration() { this.isUnboundDeclaration() }
 }
 
 private CS::Declaration toCSharpNonTypeParameter(Declaration d) { result.matchesHandle(d) }
diff --git a/csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll b/csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll
index 19bf1d4f27d..eed0d050735 100644
--- a/csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll
+++ b/csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll
@@ -287,20 +287,6 @@ private module SsaDefReaches {
     )
   }
 
-  /**
-   * Holds if the SSA definition of `v` at `def` reaches uncertain SSA definition
-   * `redef` in the same basic block, without crossing another SSA definition of `v`.
-   */
-  predicate ssaDefReachesUncertainDefWithinBlock(
-    SourceVariable v, Definition def, UncertainWriteDefinition redef
-  ) {
-    exists(BasicBlock bb, int rnk, int i |
-      ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaDef()) - 1 and
-      redef.definesAt(v, bb, i)
-    )
-  }
-
   /**
    * Same as `ssaRefRank()`, but restricted to a particular SSA definition `def`.
    */
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
index 41641a9d032..839d6b3ae0f 100644
--- a/csharp/ql/lib/semmle/code/csharp/Callable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -64,11 +64,6 @@ class Callable extends DotNet::Callable, Parameterizable, ExprOrStmtParent, @cal
     result = this.getExpressionBody()
   }
 
-  /**
-   * DEPRECATED: Use `getBody()` instead.
-   */
-  deprecated final ControlFlowElement getABody() { result = this.getBody() }
-
   override predicate hasBody() { exists(this.getBody()) }
 
   /**
@@ -151,11 +146,6 @@ class Callable extends DotNet::Callable, Parameterizable, ExprOrStmtParent, @cal
     not result = this.(Constructor).getInitializer()
   }
 
-  /**
-   * DEPRECATED: Use `getExpressionBody()` instead.
-   */
-  deprecated final Expr getAnExpressionBody() { result = this.getExpressionBody() }
-
   /** Holds if this callable has an expression body. */
   final predicate hasExpressionBody() { exists(this.getExpressionBody()) }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/Comments.qll b/csharp/ql/lib/semmle/code/csharp/Comments.qll
index 9a611b851e8..e4070ec48ca 100644
--- a/csharp/ql/lib/semmle/code/csharp/Comments.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Comments.qll
@@ -11,7 +11,7 @@ import Location
 /**
  * A single line of comment.
  *
- * Either a single line comment (`SinglelineComment`), an XML comment (`XmlComment`),
+ * Either a single line comment (`SinglelineComment`), an XML comment (`XmlCommentLine`),
  * or a line in a multi-line comment (`MultilineComment`).
  */
 class CommentLine extends @commentline {
@@ -66,7 +66,7 @@ class MultilineComment extends CommentLine, @multilinecomment {
  * /// </summary>
  * ```
  */
-class XmlComment extends CommentLine, @xmldoccomment {
+class XmlCommentLine extends CommentLine, @xmldoccomment {
   override string toString() { result = "/// ..." }
 
   private string xmlAttributeRegex() {
@@ -196,7 +196,7 @@ class CommentBlock extends @commentblock {
 
   /** Holds if this block consists entirely of XML comments. */
   predicate isXmlCommentBlock() {
-    forall(CommentLine l | l = getAChild() | l instanceof XmlComment)
+    forall(CommentLine l | l = getAChild() | l instanceof XmlCommentLine)
   }
 
   /** Gets a `CommentLine` containing text. */
diff --git a/csharp/ql/lib/semmle/code/csharp/XML.qll b/csharp/ql/lib/semmle/code/csharp/XML.qll
index dc76884b73c..fb781a4683f 100755
--- a/csharp/ql/lib/semmle/code/csharp/XML.qll
+++ b/csharp/ql/lib/semmle/code/csharp/XML.qll
@@ -4,21 +4,14 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
-  /**
-   * DEPRECATED: Use `getLocation()` instead.
-   *
-   * Gets the source location for this element.
-   */
-  deprecated Location getALocation() { result = this.getLocation() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -83,21 +76,6 @@ class XMLParent extends @xmlparent {
   /** Gets the number of places in the body of this XML parent where text occurs. */
   int getNumberOfCharacterSets() { result = count(int pos | xmlChars(_, _, this, pos, _, _)) }
 
-  /**
-   * DEPRECATED: Internal.
-   *
-   * Append the character sequences of this XML parent from left to right, separated by a space,
-   * up to a specified (zero-based) index.
-   */
-  deprecated string charsSetUpTo(int n) {
-    n = 0 and xmlChars(_, result, this, 0, _, _)
-    or
-    n > 0 and
-    exists(string chars | xmlChars(_, chars, this, n, _, _) |
-      result = this.charsSetUpTo(n - 1) + " " + chars
-    )
-  }
-
   /**
    * Gets the result of appending all the character sequences of this XML parent from
    * left to right, separated by a space.
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/Assertions.qll b/csharp/ql/lib/semmle/code/csharp/commons/Assertions.qll
index 4f364147395..df8ae6ea6ed 100644
--- a/csharp/ql/lib/semmle/code/csharp/commons/Assertions.qll
+++ b/csharp/ql/lib/semmle/code/csharp/commons/Assertions.qll
@@ -59,13 +59,6 @@ abstract class AssertMethod extends Method {
 
   /** Gets the failure type if the assertion fails for argument `i`, if any. */
   abstract AssertionFailure getAssertionFailure(int i);
-
-  /**
-   * DEPRECATED: Use `getAssertionFailure(_)` instead.
-   *
-   * Gets the exception being thrown if the assertion fails, if any.
-   */
-  deprecated final Class getExceptionClass() { this.getAssertionFailure(_).isException(result) }
 }
 
 /** A Boolean assertion method. */
@@ -76,34 +69,6 @@ abstract class BooleanAssertMethod extends AssertMethod {
   override int getAnAssertionIndex() { result = this.getAnAssertionIndex(_) }
 }
 
-/** A positive assertion method. */
-deprecated class AssertTrueMethod extends AssertMethod {
-  private BooleanAssertMethod m;
-
-  AssertTrueMethod() {
-    this = m and
-    exists(m.getAnAssertionIndex(true))
-  }
-
-  final override int getAnAssertionIndex() { result = m.getAnAssertionIndex() }
-
-  final override AssertionFailure getAssertionFailure(int i) { result = m.getAssertionFailure(i) }
-}
-
-/** A negated assertion method. */
-deprecated class AssertFalseMethod extends AssertMethod {
-  private BooleanAssertMethod m;
-
-  AssertFalseMethod() {
-    this = m and
-    exists(m.getAnAssertionIndex(false))
-  }
-
-  final override int getAnAssertionIndex() { result = m.getAnAssertionIndex() }
-
-  final override AssertionFailure getAssertionFailure(int i) { result = m.getAssertionFailure(i) }
-}
-
 /** A nullness assertion method. */
 abstract class NullnessAssertMethod extends AssertMethod {
   /**
@@ -115,34 +80,6 @@ abstract class NullnessAssertMethod extends AssertMethod {
   override int getAnAssertionIndex() { result = this.getAnAssertionIndex(_) }
 }
 
-/** A `null` assertion method. */
-deprecated class AssertNullMethod extends AssertMethod {
-  private NullnessAssertMethod m;
-
-  AssertNullMethod() {
-    this = m and
-    exists(m.getAnAssertionIndex(true))
-  }
-
-  final override int getAnAssertionIndex() { result = m.getAnAssertionIndex() }
-
-  final override AssertionFailure getAssertionFailure(int i) { result = m.getAssertionFailure(i) }
-}
-
-/** A non-`null` assertion method. */
-deprecated class AssertNonNullMethod extends AssertMethod {
-  private NullnessAssertMethod m;
-
-  AssertNonNullMethod() {
-    this = m and
-    exists(m.getAnAssertionIndex(false))
-  }
-
-  final override int getAnAssertionIndex() { result = m.getAnAssertionIndex() }
-
-  final override AssertionFailure getAssertionFailure(int i) { result = m.getAssertionFailure(i) }
-}
-
 /** An assertion, that is, a call to an assertion method. */
 class Assertion extends MethodCall {
   private AssertMethod target;
@@ -160,108 +97,6 @@ class Assertion extends MethodCall {
       result = this.getArgumentForParameter(p)
     )
   }
-
-  /**
-   * DEPRECATED: Use `getExpr(_)` instead.
-   *
-   * Gets an expression that this assertion pertains to.
-   */
-  deprecated Expr getExpr() { result = this.getExpr(_) }
-
-  /**
-   * Holds if basic block `succ` is immediately dominated by this assertion.
-   * That is, `succ` can only be reached from the callable entry point by
-   * going via *some* basic block `pred` containing this assertion, and `pred`
-   * is an immediate predecessor of `succ`.
-   *
-   * Moreover, this assertion corresponds to multiple control flow nodes,
-   * which is why
-   *
-   * ```ql
-   * exists(BasicBlock bb |
-   *   bb.getANode() = this.getAControlFlowNode() |
-   *   bb.immediatelyDominates(succ)
-   * )
-   * ```
-   *
-   * does not work.
-   */
-  pragma[nomagic]
-  deprecated private predicate immediatelyDominatesBlockSplit(BasicBlock succ) {
-    // Only calculate dominance by explicit recursion for split nodes;
-    // all other nodes can use regular CFG dominance
-    this instanceof SplitControlFlowElement and
-    exists(BasicBlock bb | bb.getANode() = this.getAControlFlowNode() |
-      succ = bb.getASuccessor() and
-      forall(BasicBlock pred | pred = succ.getAPredecessor() and pred != bb |
-        succ.dominates(pred)
-        or
-        // `pred` might be another split of this element
-        pred.getANode().getElement() = this
-      )
-    )
-  }
-
-  pragma[noinline]
-  deprecated private predicate strictlyDominatesJoinBlockPredecessor(JoinBlock jb, int i) {
-    this.strictlyDominatesSplit(jb.getJoinBlockPredecessor(i))
-  }
-
-  deprecated private predicate strictlyDominatesJoinBlockSplit(JoinBlock jb, int i) {
-    i = -1 and
-    this.strictlyDominatesJoinBlockPredecessor(jb, _)
-    or
-    this.strictlyDominatesJoinBlockSplit(jb, i - 1) and
-    (
-      this.strictlyDominatesJoinBlockPredecessor(jb, i)
-      or
-      this.getAControlFlowNode().getBasicBlock() = jb.getJoinBlockPredecessor(i)
-    )
-  }
-
-  pragma[nomagic]
-  deprecated private predicate strictlyDominatesSplit(BasicBlock bb) {
-    this.immediatelyDominatesBlockSplit(bb)
-    or
-    // Equivalent with
-    //
-    // ```ql
-    // exists(JoinBlockPredecessor pred | pred = bb.getAPredecessor() |
-    //   this.strictlyDominatesSplit(pred)
-    // ) and
-    // forall(JoinBlockPredecessor pred | pred = bb.getAPredecessor() |
-    //   this.strictlyDominatesSplit(pred)
-    //   or
-    //   this.getAControlFlowNode().getBasicBlock() = pred
-    // )
-    // ```
-    //
-    // but uses no universal recursion for better performance.
-    exists(int last | last = max(int i | exists(bb.(JoinBlock).getJoinBlockPredecessor(i))) |
-      this.strictlyDominatesJoinBlockSplit(bb, last)
-    )
-    or
-    not bb instanceof JoinBlock and
-    this.strictlyDominatesSplit(bb.getAPredecessor())
-  }
-
-  /**
-   * DEPRECATED: Use `getExpr().controlsBlock()` instead.
-   *
-   * Holds if this assertion strictly dominates basic block `bb`. That is, `bb`
-   * can only be reached from the callable entry point by going via *some* basic
-   * block containing this element.
-   *
-   * This predicate is different from
-   * `this.getAControlFlowNode().getBasicBlock().strictlyDominates(bb)`
-   * in that it takes control flow splitting into account.
-   */
-  pragma[nomagic]
-  deprecated predicate strictlyDominates(BasicBlock bb) {
-    this.strictlyDominatesSplit(bb)
-    or
-    this.getAControlFlowNode().getBasicBlock().strictlyDominates(bb)
-  }
 }
 
 /** A trivially failing assertion, for example `Debug.Assert(false)`. */
@@ -551,16 +386,6 @@ class ForwarderBooleanAssertMethod extends BooleanAssertMethod {
   }
 }
 
-/** A method that forwards to a positive assertion method. */
-deprecated class ForwarderAssertTrueMethod extends ForwarderBooleanAssertMethod {
-  ForwarderAssertTrueMethod() { exists(this.getAnAssertionIndex(true)) }
-}
-
-/** A method that forwards to a negated assertion method. */
-deprecated class ForwarderAssertFalseMethod extends ForwarderBooleanAssertMethod {
-  ForwarderAssertFalseMethod() { exists(this.getAnAssertionIndex(false)) }
-}
-
 /** A method that forwards to a nullness assertion method. */
 class ForwarderNullnessAssertMethod extends NullnessAssertMethod {
   private ForwarderAssertMethod forwarder;
@@ -580,15 +405,5 @@ class ForwarderNullnessAssertMethod extends NullnessAssertMethod {
   }
 }
 
-/** A method that forwards to a `null` assertion method. */
-deprecated class ForwarderAssertNullMethod extends ForwarderNullnessAssertMethod {
-  ForwarderAssertNullMethod() { exists(this.getAnAssertionIndex(true)) }
-}
-
-/** A method that forwards to a non-`null` assertion method. */
-deprecated class ForwarderAssertNonNullMethod extends ForwarderNullnessAssertMethod {
-  ForwarderAssertNonNullMethod() { exists(this.getAnAssertionIndex(false)) }
-}
-
 /** Holds if expression `e` appears in an assertion. */
 predicate isExprInAssertion(Expr e) { e = any(Assertion a).getExpr(_).getAChildExpr*() }
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/StructuralComparison.qll b/csharp/ql/lib/semmle/code/csharp/commons/StructuralComparison.qll
index ceac3b03aca..90755f2976c 100644
--- a/csharp/ql/lib/semmle/code/csharp/commons/StructuralComparison.qll
+++ b/csharp/ql/lib/semmle/code/csharp/commons/StructuralComparison.qll
@@ -5,6 +5,36 @@
 
 import csharp
 
+abstract private class GvnKind extends TGvnKind {
+  abstract string toString();
+}
+
+private class GvnKindExpr extends GvnKind, TGvnKindExpr {
+  private int kind;
+
+  GvnKindExpr() { this = TGvnKindExpr(kind) }
+
+  override string toString() { result = "Expr(" + kind + ")" }
+}
+
+private class GvnKindStmt extends GvnKind, TGvnKindStmt {
+  private int kind;
+
+  GvnKindStmt() { this = TGvnKindStmt(kind) }
+
+  override string toString() { result = "Stmt(" + kind + ")" }
+}
+
+private class GvnKindDeclaration extends GvnKind, TGvnKindDeclaration {
+  private int kind;
+  private boolean isTargetThis;
+  private Declaration d;
+
+  GvnKindDeclaration() { this = TGvnKindDeclaration(kind, isTargetThis, d) }
+
+  override string toString() { result = "Expr(" + kind + ")," + isTargetThis + "," + d }
+}
+
 /** Gets the declaration referenced by the expression `e`, if any. */
 private Declaration referenceAttribute(Expr e) {
   result = e.(MethodCall).getTarget()
@@ -14,17 +44,158 @@ private Declaration referenceAttribute(Expr e) {
   result = e.(Access).getTarget()
 }
 
-/** Gets the AST node kind element `e`. */
-private int elementKind(ControlFlowElement e) {
-  expressions(e, result, _)
+/** Gets a Boolean indicating whether the target of the expression `e` is `this`. */
+private boolean isTargetThis(Expr e) {
+  result = true and e.(MemberAccess).targetIsThisInstance()
   or
-  exists(int k | statements(e, k) | result = -k)
+  result = false and not e.(MemberAccess).targetIsThisInstance()
 }
 
-private int getNumberOfActualChildren(ControlFlowElement e) {
-  if e.(MemberAccess).targetIsThisInstance()
-  then result = e.getNumberOfChildren() - 1
-  else result = e.getNumberOfChildren()
+/**
+ * A global value number (GVN) for a control flow element.
+ *
+ * GVNs are used to map control flow elements to a representation that
+ * omits location information, that is, two elements that are structurally
+ * equal will be mapped to the same GVN.
+ */
+class Gvn extends TGvn {
+  /** Gets the string representation of this global value number. */
+  string toString() { none() }
+}
+
+private class ConstantGvn extends Gvn, TConstantGvn {
+  override string toString() { this = TConstantGvn(result) }
+}
+
+private class GvnNil extends Gvn, TGvnNil {
+  private GvnKind kind;
+
+  GvnNil() { this = TGvnNil(kind) }
+
+  override string toString() { result = "(kind:" + kind + ")" }
+}
+
+private class GvnCons extends Gvn, TGvnCons {
+  private Gvn head;
+  private Gvn tail;
+
+  GvnCons() { this = TGvnCons(head, tail) }
+
+  override string toString() { result = "(" + head + " :: " + tail + ")" }
+}
+
+pragma[noinline]
+private predicate gvnKindDeclaration(Expr e, int kind, boolean isTargetThis, Declaration d) {
+  isTargetThis = isTargetThis(e) and
+  // guard against elements with multiple declaration targets (DB inconsistency),
+  // which may result in a combinatorial explosion
+  d = unique(Declaration d0 | d0 = referenceAttribute(e) | d0) and
+  expressions(e, kind, _)
+}
+
+/**
+ * Gets the `GvnKind` of the element `cfe`.
+ *
+ * In case `cfe` is a reference attribute, we encode the entire declaration and whether
+ * the target is semantically equivalent to `this`.
+ */
+private GvnKind getGvnKind(ControlFlowElement cfe) {
+  exists(int kind, boolean isTargetThis, Declaration d |
+    gvnKindDeclaration(cfe, kind, isTargetThis, d) and
+    result = TGvnKindDeclaration(kind, isTargetThis, d)
+  )
+  or
+  exists(int kind |
+    not exists(referenceAttribute(cfe)) and
+    expressions(cfe, kind, _) and
+    result = TGvnKindExpr(kind)
+    or
+    statements(cfe, kind) and
+    result = TGvnKindStmt(kind)
+  )
+}
+
+private Gvn toGvn(ControlFlowElement cfe, GvnKind kind, int index) {
+  kind = getGvnKind(cfe) and
+  result = TGvnNil(kind) and
+  index = -1
+  or
+  exists(Gvn head, Gvn tail |
+    toGvnCons(cfe, kind, index, head, tail) and
+    result = TGvnCons(head, tail)
+  )
+}
+
+private int getNumberOfActualChildren(ControlFlowElement cfe) {
+  if cfe.(MemberAccess).targetIsThisInstance()
+  then result = cfe.getNumberOfChildren() - 1
+  else result = cfe.getNumberOfChildren()
+}
+
+private ControlFlowElement getRankedChild(ControlFlowElement cfe, int rnk) {
+  result =
+    rank[rnk + 1](ControlFlowElement child, int j |
+      child = cfe.getChild(j) and
+      (
+        j >= 0
+        or
+        j = -1 and not cfe.(MemberAccess).targetIsThisInstance()
+      )
+    |
+      child order by j
+    )
+}
+
+pragma[noinline]
+private Gvn toGvnChild(ControlFlowElement cfe, int index) {
+  result = toGvn(getRankedChild(cfe, index))
+}
+
+pragma[noinline]
+private predicate toGvnCons(ControlFlowElement cfe, GvnKind kind, int index, Gvn head, Gvn tail) {
+  tail = toGvn(cfe, kind, index - 1) and
+  head = toGvnChild(cfe, index)
+}
+
+cached
+private module Cached {
+  cached
+  newtype TGvnKind =
+    TGvnKindExpr(int kind) { expressions(_, kind, _) } or
+    TGvnKindStmt(int kind) { statements(_, kind) } or
+    TGvnKindDeclaration(int kind, boolean thisTarget, Declaration d) {
+      exists(Expr e |
+        d = referenceAttribute(e) and thisTarget = isTargetThis(e) and expressions(e, kind, _)
+      )
+    }
+
+  cached
+  newtype TGvn =
+    TConstantGvn(string s) { s = any(Expr e).getValue() } or
+    TGvnNil(GvnKind gkind) or
+    TGvnCons(Gvn head, Gvn tail) { toGvnCons(_, _, _, head, tail) }
+
+  /** Gets the global value number of the element `cfe`. */
+  cached
+  Gvn toGvnCached(ControlFlowElement cfe) {
+    result = TConstantGvn(cfe.(Expr).getValue())
+    or
+    not exists(cfe.(Expr).getValue()) and
+    exists(GvnKind kind, int index |
+      result = toGvn(cfe, kind, index - 1) and
+      index = getNumberOfActualChildren(cfe)
+    )
+  }
+}
+
+private import Cached
+
+predicate toGvn = toGvnCached/1;
+
+pragma[inline]
+private predicate sameGvn(ControlFlowElement x, ControlFlowElement y) {
+  pragma[only_bind_into](toGvn(pragma[only_bind_out](x))) =
+    pragma[only_bind_into](toGvn(pragma[only_bind_out](y)))
 }
 
 /**
@@ -57,87 +228,12 @@ abstract class StructuralComparisonConfiguration extends string {
    */
   abstract predicate candidate(ControlFlowElement x, ControlFlowElement y);
 
-  private predicate candidateInternal(ControlFlowElement x, ControlFlowElement y) {
-    candidate(x, y)
-    or
-    exists(ControlFlowElement xParent, ControlFlowElement yParent, int i |
-      candidateInternalChild(xParent, i, x, yParent)
-    |
-      y = yParent.getChild(i)
-    )
-  }
-
-  pragma[noinline]
-  private predicate candidateInternalChild(
-    ControlFlowElement x, int i, ControlFlowElement xChild, ControlFlowElement y
-  ) {
-    candidateInternal(x, y) and
-    xChild = x.getChild(i)
-  }
-
-  private predicate sameByValue(Expr x, Expr y) { sameByValueAux(x, y, y.getValue()) }
-
-  pragma[nomagic]
-  private predicate sameByValueAux(Expr x, Expr y, string value) {
-    candidateInternal(x, y) and
-    value = x.getValue()
-  }
-
-  private ControlFlowElement getRankedChild(ControlFlowElement cfe, int rnk, int i) {
-    (candidateInternal(cfe, _) or candidateInternal(_, cfe)) and
-    i =
-      rank[rnk](int j |
-        exists(ControlFlowElement child | child = cfe.getChild(j) |
-          not (j = -1 and cfe.(MemberAccess).targetIsThisInstance())
-        )
-      ) and
-    result = cfe.getChild(i)
-  }
-
-  pragma[nomagic]
-  private predicate sameByStructure0(
-    ControlFlowElement x, ControlFlowElement y, int elementKind, int children
-  ) {
-    candidateInternal(x, y) and
-    elementKind = elementKind(x) and
-    children = getNumberOfActualChildren(x) and
-    not (x.(Expr).hasValue() and y.(Expr).hasValue())
-  }
-
-  pragma[nomagic]
-  private predicate sameByStructure(ControlFlowElement x, ControlFlowElement y, int i) {
-    i = 0 and
-    // At least one of `x` and `y` must not have a value, they must have
-    // the same kind, and the same number of children
-    sameByStructure0(x, y, elementKind(y), getNumberOfActualChildren(y)) and
-    // If one of them has a reference attribute, they should both reference
-    // the same node
-    (exists(referenceAttribute(x)) implies referenceAttribute(x) = referenceAttribute(y)) and
-    // x is a member access on `this` iff y is
-    (x.(MemberAccess).targetIsThisInstance() implies y.(MemberAccess).targetIsThisInstance()) and
-    (y.(MemberAccess).targetIsThisInstance() implies x.(MemberAccess).targetIsThisInstance())
-    or
-    exists(int j | sameByStructure(x, y, i - 1) |
-      sameInternal(getRankedChild(x, i, j), getRankedChild(y, i, j))
-    )
-  }
-
-  pragma[nomagic]
-  private predicate sameInternal(ControlFlowElement x, ControlFlowElement y) {
-    sameByValue(x, y)
-    or
-    sameByStructure(x, y, getNumberOfActualChildren(x))
-  }
-
   /**
    * Holds if elements `x` and `y` structurally equal. `x` and `y` must be
    * flagged as candidates for structural equality, that is,
    * `candidate(x, y)` must hold.
    */
-  predicate same(ControlFlowElement x, ControlFlowElement y) {
-    candidate(x, y) and
-    sameInternal(x, y)
-  }
+  predicate same(ControlFlowElement x, ControlFlowElement y) { candidate(x, y) and sameGvn(x, y) }
 }
 
 /**
@@ -183,86 +279,11 @@ module Internal {
      */
     abstract predicate candidate(ControlFlowElement x, ControlFlowElement y);
 
-    private predicate candidateInternal(ControlFlowElement x, ControlFlowElement y) {
-      candidate(x, y)
-      or
-      exists(ControlFlowElement xParent, ControlFlowElement yParent, int i |
-        candidateInternalChild(xParent, i, x, yParent)
-      |
-        y = yParent.getChild(i)
-      )
-    }
-
-    pragma[noinline]
-    private predicate candidateInternalChild(
-      ControlFlowElement x, int i, ControlFlowElement xChild, ControlFlowElement y
-    ) {
-      candidateInternal(x, y) and
-      xChild = x.getChild(i)
-    }
-
-    private predicate sameByValue(Expr x, Expr y) { sameByValueAux(x, y, y.getValue()) }
-
-    pragma[nomagic]
-    private predicate sameByValueAux(Expr x, Expr y, string value) {
-      candidateInternal(x, y) and
-      value = x.getValue()
-    }
-
-    private ControlFlowElement getRankedChild(ControlFlowElement cfe, int rnk, int i) {
-      (candidateInternal(cfe, _) or candidateInternal(_, cfe)) and
-      i =
-        rank[rnk](int j |
-          exists(ControlFlowElement child | child = cfe.getChild(j) |
-            not (j = -1 and cfe.(MemberAccess).targetIsThisInstance())
-          )
-        ) and
-      result = cfe.getChild(i)
-    }
-
-    pragma[nomagic]
-    private predicate sameByStructure0(
-      ControlFlowElement x, ControlFlowElement y, int elementKind, int children
-    ) {
-      candidateInternal(x, y) and
-      elementKind = elementKind(x) and
-      children = getNumberOfActualChildren(x) and
-      not (x.(Expr).hasValue() and y.(Expr).hasValue())
-    }
-
-    pragma[nomagic]
-    private predicate sameByStructure(ControlFlowElement x, ControlFlowElement y, int i) {
-      i = 0 and
-      // At least one of `x` and `y` must not have a value, they must have
-      // the same kind, and the same number of children
-      sameByStructure0(x, y, elementKind(y), getNumberOfActualChildren(y)) and
-      // If one of them has a reference attribute, they should both reference
-      // the same node
-      (exists(referenceAttribute(x)) implies referenceAttribute(x) = referenceAttribute(y)) and
-      // x is a member access on `this` iff y is
-      (x.(MemberAccess).targetIsThisInstance() implies y.(MemberAccess).targetIsThisInstance()) and
-      (y.(MemberAccess).targetIsThisInstance() implies x.(MemberAccess).targetIsThisInstance())
-      or
-      exists(int j | sameByStructure(x, y, i - 1) |
-        sameInternal(getRankedChild(x, i, j), getRankedChild(y, i, j))
-      )
-    }
-
-    pragma[nomagic]
-    private predicate sameInternal(ControlFlowElement x, ControlFlowElement y) {
-      sameByValue(x, y)
-      or
-      sameByStructure(x, y, getNumberOfActualChildren(x))
-    }
-
     /**
      * Holds if elements `x` and `y` structurally equal. `x` and `y` must be
      * flagged as candidates for structural equality, that is,
      * `candidate(x, y)` must hold.
      */
-    predicate same(ControlFlowElement x, ControlFlowElement y) {
-      candidate(x, y) and
-      sameInternal(x, y)
-    }
+    predicate same(ControlFlowElement x, ControlFlowElement y) { candidate(x, y) and sameGvn(x, y) }
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
index 9e7fd92d2a4..6c6a66c4ac2 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
@@ -227,35 +227,4 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
     cb.getLastNode() = this.getAControlFlowNode() and
     cb.controls(controlled, s)
   }
-
-  /** DEPRECATED: Use `controlsBlock/3` instead. */
-  deprecated predicate controlsBlock(BasicBlock controlled, ConditionalSuccessor s) {
-    this.controlsBlock(controlled, s, _)
-  }
-
-  /**
-   * DEPRECATED.
-   *
-   * Holds if control flow element `controlled` is controlled by this control flow
-   * element with conditional value `s`. That is, `controlled` can only be reached
-   * from the callable entry point by going via the `s` edge out of this element.
-   *
-   * This predicate is different from
-   *
-   * ```ql
-   * exists(ConditionBlock cb |
-   *   cb.getLastNode() = this.getAControlFlowNode() |
-   *   cb.controls(controlled.getAControlFlowNode().getBasicBlock(), s)
-   * )
-   * ```
-   *
-   * as control flow splitting is taken into account.
-   */
-  // potentially very large predicate, so must be inlined
-  pragma[inline]
-  deprecated predicate controlsElement(ControlFlowElement controlled, ConditionalSuccessor s) {
-    forex(BasicBlock bb | bb = controlled.getAControlFlowNode().getBasicBlock() |
-      this.controlsBlock(bb, s)
-    )
-  }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
index 7e9b8f7818a..062be133c58 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
@@ -1000,7 +1000,7 @@ module Internal {
   // The predicates in this module should be evaluated in the same stage as the CFG
   // construction stage. This is to avoid recomputation of pre-basic-blocks and
   // pre-SSA predicates
-  private module PreCFG {
+  private module PreCfg {
     private import semmle.code.csharp.controlflow.internal.PreBasicBlocks as PreBasicBlocks
     private import semmle.code.csharp.controlflow.internal.PreSsa
 
@@ -1414,7 +1414,7 @@ module Internal {
     }
 
     cached
-    private module CachedWithCFG {
+    private module CachedWithCfg {
       private import semmle.code.csharp.Caching
 
       cached
@@ -1719,10 +1719,10 @@ module Internal {
       }
     }
 
-    import CachedWithCFG
+    import CachedWithCfg
   }
 
-  import PreCFG
+  import PreCfg
 
   private predicate interestingDescendantCandidate(Expr e) {
     guardControls(e, _, _)
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
index b6b0c95ddc0..02fb893cb7f 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -511,13 +511,6 @@ module FinallySplitting {
     predicate isEntryNode() { first(try.getFinally(), this) }
   }
 
-  /** A control flow element that does not belong to a `finally` block. */
-  private class NonFinallyControlFlowElement extends ControlFlowElement {
-    NonFinallyControlFlowElement() {
-      not this = any(Statements::TryStmtTree t).getAFinallyDescendant()
-    }
-  }
-
   /**
    * A split for elements belonging to a `finally` block, which determines how to
    * continue execution after leaving the `finally` block. For example, in
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll
index 76da2fb62ef..154ab9423b9 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll
@@ -26,9 +26,6 @@ private newtype TSuccessorType =
 class SuccessorType extends TSuccessorType {
   /** Gets a textual representation of successor type. */
   string toString() { none() }
-
-  /** Holds if this successor type matches completion `c`. */
-  deprecated predicate matchesCompletion(Completion c) { this = c.getAMatchingSuccessorType() }
 }
 
 /** Provides different types of control flow successor types. */
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll
index 19bf1d4f27d..eed0d050735 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll
@@ -287,20 +287,6 @@ private module SsaDefReaches {
     )
   }
 
-  /**
-   * Holds if the SSA definition of `v` at `def` reaches uncertain SSA definition
-   * `redef` in the same basic block, without crossing another SSA definition of `v`.
-   */
-  predicate ssaDefReachesUncertainDefWithinBlock(
-    SourceVariable v, Definition def, UncertainWriteDefinition redef
-  ) {
-    exists(BasicBlock bb, int rnk, int i |
-      ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaDef()) - 1 and
-      redef.definesAt(v, bb, i)
-    )
-  }
-
   /**
    * Same as `ssaRefRank()`, but restricted to a particular SSA definition `def`.
    */
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll
index 2a58cba6209..b919d143a39 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll
@@ -111,13 +111,6 @@ private predicate evenlyDivisibleExpr(Expr e, int factor) {
   )
 }
 
-/**
- * Holds if `rix` is the number of input edges to `phi`.
- */
-private predicate maxPhiInputRank(SsaPhiNode phi, int rix) {
-  rix = max(int r | rankedPhiInput(phi, _, _, r))
-}
-
 /**
  * Gets the remainder of `val` modulo `mod`.
  *
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
index 80b7d5d6d36..e900b36a023 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
@@ -427,11 +427,6 @@ module Ssa {
       not result instanceof PhiNode
     }
 
-    /**
-     * DEPRECATED: Use `definesAt/3` instead.
-     */
-    deprecated predicate definesAt(ControlFlow::BasicBlock bb, int i) { this.definesAt(_, bb, i) }
-
     /**
      * Gets the syntax element associated with this SSA definition, if any.
      * This is either an expression, for example `x = 0`, a parameter, or a
@@ -655,14 +650,6 @@ module Ssa {
     override Location getLocation() { result = this.getQualifierDefinition().getLocation() }
   }
 
-  /**
-   * An SSA definition that has no actual semantics, but simply serves to
-   * merge or filter data flow.
-   *
-   * Phi nodes are the canonical (and currently only) example.
-   */
-  deprecated class PseudoDefinition = PhiNode;
-
   /**
    * An SSA phi node, that is, a pseudo definition for a variable at a point
    * in the flow graph where otherwise two or more definitions for the variable
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
index 87593b2dcd3..f9f4a4ad50d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -2026,3 +2026,8 @@ abstract class SyntheticField extends string {
   /** Gets the type of this synthetic field. */
   Type getType() { result instanceof ObjectType }
 }
+
+/**
+ * Holds if the the content `c` is a container.
+ */
+predicate containerContent(DataFlow::Content c) { c instanceof DataFlow::ElementContent }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
index b6d749e18fd..7151b5cb29f 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -204,12 +204,6 @@ class Content extends TContent {
 
   /** Gets the location of this content. */
   Location getLocation() { none() }
-
-  /** Gets the type of the object containing this content. */
-  deprecated Gvn::GvnType getContainerType() { none() }
-
-  /** Gets the type of this content. */
-  deprecated Gvn::GvnType getType() { none() }
 }
 
 /** A reference to a field. */
@@ -224,12 +218,6 @@ class FieldContent extends Content, TFieldContent {
   override string toString() { result = "field " + f.getName() }
 
   override Location getLocation() { result = f.getLocation() }
-
-  deprecated override Gvn::GvnType getContainerType() {
-    result = Gvn::getGlobalValueNumber(f.getDeclaringType())
-  }
-
-  deprecated override Gvn::GvnType getType() { result = Gvn::getGlobalValueNumber(f.getType()) }
 }
 
 /** A reference to a synthetic field. */
@@ -256,12 +244,6 @@ class PropertyContent extends Content, TPropertyContent {
   override string toString() { result = "property " + p.getName() }
 
   override Location getLocation() { result = p.getLocation() }
-
-  deprecated override Gvn::GvnType getContainerType() {
-    result = Gvn::getGlobalValueNumber(p.getDeclaringType())
-  }
-
-  deprecated override Gvn::GvnType getType() { result = Gvn::getGlobalValueNumber(p.getType()) }
 }
 
 /** A reference to an element in a collection. */
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll
index 19bf1d4f27d..eed0d050735 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll
@@ -287,20 +287,6 @@ private module SsaDefReaches {
     )
   }
 
-  /**
-   * Holds if the SSA definition of `v` at `def` reaches uncertain SSA definition
-   * `redef` in the same basic block, without crossing another SSA definition of `v`.
-   */
-  predicate ssaDefReachesUncertainDefWithinBlock(
-    SourceVariable v, Definition def, UncertainWriteDefinition redef
-  ) {
-    exists(BasicBlock bb, int rnk, int i |
-      ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaDef()) - 1 and
-      redef.definesAt(v, bb, i)
-    )
-  }
-
   /**
    * Same as `ssaRefRank()`, but restricted to a particular SSA definition `def`.
    */
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
index f2e99db0663..2df41e00299 100755
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
@@ -31,8 +31,6 @@ predicate defaultTaintSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
 bindingset[node]
 predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::Content c) { none() }
 
-deprecated predicate localAdditionalTaintStep = defaultAdditionalTaintStep/2;
-
 private CIL::DataFlowNode asCilDataFlowNode(DataFlow::Node node) {
   result = node.asParameter() or
   result = node.asExpr()
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll
index 19bf1d4f27d..eed0d050735 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll
@@ -287,20 +287,6 @@ private module SsaDefReaches {
     )
   }
 
-  /**
-   * Holds if the SSA definition of `v` at `def` reaches uncertain SSA definition
-   * `redef` in the same basic block, without crossing another SSA definition of `v`.
-   */
-  predicate ssaDefReachesUncertainDefWithinBlock(
-    SourceVariable v, Definition def, UncertainWriteDefinition redef
-  ) {
-    exists(BasicBlock bb, int rnk, int i |
-      ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaDef()) - 1 and
-      redef.definesAt(v, bb, i)
-    )
-  }
-
   /**
    * Same as `ssaRefRank()`, but restricted to a particular SSA definition `def`.
    */
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 030020ede63..74aee61e690 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
@@ -43,37 +43,4 @@ module Private {
   predicate ssaUpdateStep = RU::ssaUpdateStep/3;
 
   Expr getABasicBlockExpr(BasicBlock bb) { result = bb.getANode() }
-
-  private class PhiInputEdgeBlock extends BasicBlock {
-    PhiInputEdgeBlock() { this = any(SsaReadPositionPhiInputEdge edge).getOrigBlock() }
-  }
-
-  int getId(PhiInputEdgeBlock bb) {
-    exists(CfgImpl::ControlFlowTree::Range_ t | CfgImpl::ControlFlowTree::idOf(t, result) |
-      t = bb.getFirstNode().getElement()
-      or
-      t = bb.(CS::ControlFlow::BasicBlocks::EntryBlock).getCallable()
-    )
-  }
-
-  private string getSplitString(PhiInputEdgeBlock bb) {
-    result = bb.getFirstNode().(CS::ControlFlow::Nodes::ElementNode).getSplitsString()
-    or
-    not exists(bb.getFirstNode().(CS::ControlFlow::Nodes::ElementNode).getSplitsString()) and
-    result = ""
-  }
-
-  /**
-   * Holds if `inp` is an input to `phi` along `edge` and this input has index `r`
-   * in an arbitrary 1-based numbering of the input edges to `phi`.
-   */
-  predicate rankedPhiInput(SsaPhiNode phi, SsaVariable inp, SsaReadPositionPhiInputEdge edge, int r) {
-    edge.phiInput(phi, inp) and
-    edge =
-      rank[r](SsaReadPositionPhiInputEdge e |
-        e.phiInput(phi, _)
-      |
-        e order by getId(e.getOrigBlock()), getSplitString(e.getOrigBlock())
-      )
-  }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll
index e450c11b5ab..08335f6680d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll
@@ -3,6 +3,7 @@
  */
 
 private import SsaReadPositionSpecific
+import SsaReadPositionSpecific::Public
 
 private newtype TSsaReadPosition =
   TSsaReadPositionBlock(BasicBlock bb) { bb = getAReadBasicBlock(_) } or
@@ -55,3 +56,10 @@ class SsaReadPositionPhiInputEdge extends SsaReadPosition, TSsaReadPositionPhiIn
 
   override string toString() { result = "edge" }
 }
+
+/**
+ * Holds if `rix` is the number of input edges to `phi`.
+ */
+predicate maxPhiInputRank(SsaPhiNode phi, int rix) {
+  rix = max(int r | rankedPhiInput(phi, _, _, r))
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
index 7afd9a2a33d..6b91651691d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
@@ -3,6 +3,8 @@
  */
 
 private import csharp
+private import SsaReadPositionCommon
+private import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl as CfgImpl
 
 class SsaVariable = Ssa::Definition;
 
@@ -14,3 +16,41 @@ class BasicBlock = ControlFlow::BasicBlock;
 BasicBlock getAReadBasicBlock(SsaVariable v) {
   result = v.getARead().getAControlFlowNode().getBasicBlock()
 }
+
+private class PhiInputEdgeBlock extends BasicBlock {
+  PhiInputEdgeBlock() { this = any(SsaReadPositionPhiInputEdge edge).getOrigBlock() }
+}
+
+private int getId(PhiInputEdgeBlock bb) {
+  exists(CfgImpl::ControlFlowTree::Range_ t | CfgImpl::ControlFlowTree::idOf(t, result) |
+    t = bb.getFirstNode().getElement()
+    or
+    t = bb.(ControlFlow::BasicBlocks::EntryBlock).getCallable()
+  )
+}
+
+private string getSplitString(PhiInputEdgeBlock bb) {
+  result = bb.getFirstNode().(ControlFlow::Nodes::ElementNode).getSplitsString()
+  or
+  not exists(bb.getFirstNode().(ControlFlow::Nodes::ElementNode).getSplitsString()) and
+  result = ""
+}
+
+/**
+ * Declarations to be exposed to users of SsaReadPositionCommon.
+ */
+module Public {
+  /**
+   * Holds if `inp` is an input to `phi` along `edge` and this input has index `r`
+   * in an arbitrary 1-based numbering of the input edges to `phi`.
+   */
+  predicate rankedPhiInput(SsaPhiNode phi, SsaVariable inp, SsaReadPositionPhiInputEdge edge, int r) {
+    edge.phiInput(phi, inp) and
+    edge =
+      rank[r](SsaReadPositionPhiInputEdge e |
+        e.phiInput(phi, _)
+      |
+        e order by getId(e.getOrigBlock()), getSplitString(e.getOrigBlock())
+      )
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll
index c3bf63b1779..79dc36fd48d 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll
@@ -435,10 +435,10 @@ class AnonymousFunctionExpr extends Expr, Callable, Modifiable, @anonymous_funct
  * A lambda expression, for example `(int x) => x + 1`.
  */
 class LambdaExpr extends AnonymousFunctionExpr, @lambda_expr {
-  /* Holds if this lambda expression has explicit return type. */
+  /** Holds if this lambda expression has explicit return type. */
   predicate hasExplicitReturnType() { lambda_expr_return_type(this, _) }
 
-  /* Gets the explicit return type of this lambda expression, if any. */
+  /** Gets the explicit return type of this lambda expression, if any. */
   Type getExplicitReturnType() { lambda_expr_return_type(this, getTypeRef(result)) }
 
   override string toString() { result = "(...) => ..." }
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll
index 2ffbfe6e7e1..54fa60e03f2 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll
@@ -170,40 +170,6 @@ class InvalidFormatString extends StringLiteral {
   }
 }
 
-/** Provides a dataflow configuration for format strings. */
-deprecated module FormatFlow {
-  private import semmle.code.csharp.dataflow.DataFlow
-
-  private class FormatConfiguration extends DataFlow2::Configuration {
-    FormatConfiguration() { this = "format" }
-
-    override predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLiteral }
-
-    override predicate isSink(DataFlow::Node n) {
-      exists(FormatCall c | n.asExpr() = c.getFormatExpr())
-    }
-  }
-
-  deprecated query predicate nodes = DataFlow2::PathGraph::nodes/3;
-
-  deprecated query predicate edges = DataFlow2::PathGraph::edges/2;
-
-  deprecated class PathNode = DataFlow2::PathNode;
-
-  /**
-   * Holds if there is flow from string literal `lit` to the format string in
-   * `call`. `litNode` and `formatNode` are the corresponding data-flow path
-   * nodes.
-   */
-  deprecated predicate hasFlowPath(
-    StringLiteral lit, PathNode litNode, FormatCall call, PathNode formatNode
-  ) {
-    litNode.getNode().asExpr() = lit and
-    formatNode.getNode().asExpr() = call.getFormatExpr() and
-    any(FormatConfiguration conf).hasFlowPath(litNode, formatNode)
-  }
-}
-
 /**
  * A method call to a method that formats a string, for example a call
  * to `string.Format()`.
@@ -229,14 +195,6 @@ class FormatCall extends MethodCall {
     this.getArgument(this.getFirstArgument()).getType() instanceof ArrayType
   }
 
-  /**
-   * DEPRECATED: Use `FormatFlow::hasFlowPath()` instead.
-   *
-   * Gets a format string. Global data flow analysis is applied to retrieve all
-   * sources that can reach this method call.
-   */
-  deprecated StringLiteral getAFormatSource() { FormatFlow::hasFlowPath(result, _, this, _) }
-
   /**
    * Gets the number of supplied arguments (excluding the format string and format
    * provider). Does not return a value if the arguments are supplied in an array,
@@ -255,11 +213,4 @@ class FormatCall extends MethodCall {
     index = this.getASuppliedArgument() and
     result = this.getArgument(this.getFirstArgument() + index)
   }
-
-  /** Gets a supplied argument that is not used in the format string `src`. */
-  deprecated int getAnUnusedArgument(ValidFormatString src) {
-    result = this.getASuppliedArgument() and
-    FormatFlow::hasFlowPath(src, _, this, _) and
-    not result = src.getAnInsert()
-  }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/ServiceStack.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/ServiceStack.qll
index 4f914899a98..bf4a72b4174 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/ServiceStack.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/ServiceStack.qll
@@ -24,13 +24,6 @@ private class ServiceClass extends Class {
   }
 }
 
-/** Top-level Request DTO types */
-private class RequestDTO extends Class {
-  RequestDTO() {
-    this.getABaseType*().getABaseInterface().hasQualifiedName("ServiceStack", "IReturn")
-  }
-}
-
 /** Flow sources for the ServiceStack framework */
 module Sources {
   private import semmle.code.csharp.security.dataflow.flowsources.Remote
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Linq.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Linq.qll
index c2453755d69..349fd65750f 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Linq.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Linq.qll
@@ -2,14 +2,14 @@
  * Provides classes related to the namespace `System.Linq`.
  */
 
-private import csharp as csharp
+private import csharp as CSharp
 private import semmle.code.csharp.frameworks.System as System
 private import semmle.code.csharp.dataflow.ExternalFlow as ExternalFlow
 
 /** Definitions relating to the `System.Linq` namespace. */
 module SystemLinq {
   /** The `System.Linq` namespace. */
-  class Namespace extends csharp::Namespace {
+  class Namespace extends CSharp::Namespace {
     Namespace() {
       this.getParentNamespace() instanceof System::SystemNamespace and
       this.hasUndecoratedName("Linq")
@@ -17,7 +17,7 @@ module SystemLinq {
   }
 
   /** A class in the `System.Linq` namespace. */
-  class Class extends csharp::Class {
+  class Class extends CSharp::Class {
     Class() { this.getNamespace() instanceof Namespace }
   }
 
@@ -26,10 +26,10 @@ module SystemLinq {
     SystemLinqEnumerableClass() { this.hasName("Enumerable") }
 
     /** Gets a `Count()` method. */
-    csharp::ExtensionMethod getACountMethod() { result = this.getAMethod("Count<>") }
+    CSharp::ExtensionMethod getACountMethod() { result = this.getAMethod("Count<>") }
 
     /** Gets an `Any()` method. */
-    csharp::ExtensionMethod getAnAnyMethod() { result = this.getAMethod("Any<>") }
+    CSharp::ExtensionMethod getAnAnyMethod() { result = this.getAMethod("Any<>") }
   }
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Common.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Common.qll
index e35bbc341ac..0901b400362 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Common.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Common.qll
@@ -2,14 +2,14 @@
  * Provides classes related to the namespace `System.Data.Common`.
  */
 
-private import csharp as csharp
+private import csharp as CSharp
 private import semmle.code.csharp.frameworks.system.Data as Data
 private import semmle.code.csharp.dataflow.ExternalFlow as ExternalFlow
 
 /** Definitions relating to the `System.Data.Common` namespace. */
 module SystemDataCommon {
   /** The `System.Data.Common` namespace. */
-  class Namespace extends csharp::Namespace {
+  class Namespace extends CSharp::Namespace {
     Namespace() {
       this.getParentNamespace() instanceof Data::SystemDataNamespace and
       this.hasName("Common")
@@ -17,7 +17,7 @@ module SystemDataCommon {
   }
 
   /** A class in the `System.Data.Common` namespace. */
-  class Class extends csharp::Class {
+  class Class extends CSharp::Class {
     Class() { this.getNamespace() instanceof Namespace }
   }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Entity.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Entity.qll
index 5109db04af6..a5067d860ed 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Entity.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/data/Entity.qll
@@ -2,13 +2,13 @@
  * Provides classes related to the Entity Framework namespace `System.Data.Entity`.
  */
 
-private import csharp as csharp
+private import csharp as CSharp
 private import semmle.code.csharp.frameworks.system.Data as Data
 
 /** Definitions relating to the `System.Data.Entity` namespace. */
 module SystemDataEntity {
   /** The `System.Data.Entity` namespace. */
-  class Namespace extends csharp::Namespace {
+  class Namespace extends CSharp::Namespace {
     Namespace() {
       this.getParentNamespace() instanceof Data::SystemDataNamespace and
       this.hasName("Entity")
@@ -16,7 +16,7 @@ module SystemDataEntity {
   }
 
   /** A class in the `System.Data.Entity` namespace. */
-  class Class extends csharp::Class {
+  class Class extends CSharp::Class {
     Class() { this.getNamespace() instanceof Namespace }
   }
 
@@ -25,28 +25,28 @@ module SystemDataEntity {
     Database() { this.hasName("Database") }
 
     /** Gets the `ExecuteSqlCommand` method. */
-    csharp::Method getExecuteSqlCommandMethod() { result = this.getAMethod("ExecuteSqlCommand") }
+    CSharp::Method getExecuteSqlCommandMethod() { result = this.getAMethod("ExecuteSqlCommand") }
 
     /** Gets the `ExecuteSqlCommandAsync` method. */
-    csharp::Method getExecuteSqlCommandAsyncMethod() {
+    CSharp::Method getExecuteSqlCommandAsyncMethod() {
       result = this.getAMethod("ExecuteSqlCommandAsync")
     }
 
     /** Gets the `SqlQuery` method. */
-    csharp::Method getSqlQueryMethod() { result = this.getAMethod("SqlQuery") }
+    CSharp::Method getSqlQueryMethod() { result = this.getAMethod("SqlQuery") }
   }
 
   /** The `System.Data.Entity.DbSet` class. */
   class DbSet extends Class {
     DbSet() {
-      this.getUnboundDeclaration().(csharp::UnboundGenericClass).getUndecoratedName() = "DbSet"
+      this.getUnboundDeclaration().(CSharp::UnboundGenericClass).getUndecoratedName() = "DbSet"
     }
 
     /** Gets the `SqlQuery` method. */
-    csharp::Method getSqlQueryMethod() { result = this.getAMethod("SqlQuery") }
+    CSharp::Method getSqlQueryMethod() { result = this.getAMethod("SqlQuery") }
 
     /** Gets the `DbSet` type, if any. */
-    csharp::Type getDbSetType() { result = this.(csharp::ConstructedType).getTypeArgument(0) }
+    CSharp::Type getDbSetType() { result = this.(CSharp::ConstructedType).getTypeArgument(0) }
   }
 
   /** The `System.Data.Entity.DbContext` class. */
@@ -55,23 +55,23 @@ module SystemDataEntity {
   }
 
   /** A user provided sub type of `DbContext`. */
-  class CustomDbContext extends csharp::Class {
+  class CustomDbContext extends CSharp::Class {
     CustomDbContext() {
       this.fromSource() and
       this.getABaseType+() instanceof DbContext
     }
 
     /** Gets a property that has the type `DbSet`. */
-    csharp::Property getADbSetProperty() {
+    CSharp::Property getADbSetProperty() {
       result = this.getAProperty() and
       result.getType() instanceof DbSet
     }
   }
 
   /** An Entity Framework entity, as referenced from a `CustomDbContext`. */
-  class Entity extends csharp::Class {
+  class Entity extends CSharp::Class {
     Entity() {
-      exists(CustomDbContext dbContext, csharp::Property p |
+      exists(CustomDbContext dbContext, CSharp::Property p |
         p = dbContext.getADbSetProperty() and
         this = p.getType().(DbSet).getDbSetType()
       )
@@ -82,7 +82,7 @@ module SystemDataEntity {
 /** Definitions relating to the `System.Data.Entity.Infrastructure` namespace. */
 module SystemDataEntityInfrastructure {
   /** The `System.Data.Entity.Infrastructure` namespace. */
-  class Namespace extends csharp::Namespace {
+  class Namespace extends CSharp::Namespace {
     Namespace() {
       this.getParentNamespace() instanceof SystemDataEntity::Namespace and
       this.hasName("Infrastructure")
@@ -90,7 +90,7 @@ module SystemDataEntityInfrastructure {
   }
 
   /** A class in the `System.Data.Entity.Infrastructure` namespace. */
-  class Class extends csharp::Class {
+  class Class extends CSharp::Class {
     Class() { this.getNamespace() instanceof Namespace }
   }
 
@@ -99,7 +99,7 @@ module SystemDataEntityInfrastructure {
     DbRawSqlQuery() {
       this.getABaseType*()
           .getUnboundDeclaration()
-          .(csharp::UnboundGenericClass)
+          .(CSharp::UnboundGenericClass)
           .getUndecoratedName() = "DbRawSqlQuery"
     }
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/linq/Expressions.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/linq/Expressions.qll
index c4126834d20..41c057ea51d 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/linq/Expressions.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/linq/Expressions.qll
@@ -2,13 +2,13 @@
  * Provides classes related to the namespace `System.Linq.Expressions`.
  */
 
-private import csharp as csharp
+private import csharp as CSharp
 private import semmle.code.csharp.frameworks.system.Linq
 
 /** Definitions relating to the `System.Linq.Expressions` namespace. */
 module SystemLinqExpressions {
   /** The `System.Linq.Expressions` namespace. */
-  class Namespace extends csharp::Namespace {
+  class Namespace extends CSharp::Namespace {
     Namespace() {
       this.getParentNamespace() instanceof SystemLinq::Namespace and
       this.hasName("Expressions")
@@ -16,12 +16,12 @@ module SystemLinqExpressions {
   }
 
   /** A class in the `System.Linq.Expressions` namespace. */
-  class Class extends csharp::Class {
+  class Class extends CSharp::Class {
     Class() { this.getNamespace() instanceof Namespace }
   }
 
   /** The `Expression<TDelegate>` class. */
-  class ExpressionDelegate extends Class, csharp::UnboundGenericClass {
+  class ExpressionDelegate extends Class, CSharp::UnboundGenericClass {
     ExpressionDelegate() { this.hasName("Expression<>") }
   }
 
@@ -30,20 +30,20 @@ module SystemLinqExpressions {
    * or a type of the form `Expression<T>`, where `T` is an actual
    * `delegate` type.
    */
-  class DelegateExtType extends csharp::Type {
-    csharp::DelegateType dt;
+  class DelegateExtType extends CSharp::Type {
+    CSharp::DelegateType dt;
 
     DelegateExtType() {
       this = dt
       or
       this =
-        any(csharp::ConstructedClass cc |
+        any(CSharp::ConstructedClass cc |
           cc.getUnboundGeneric() instanceof ExpressionDelegate and
           dt = cc.getTypeArgument(0)
         )
     }
 
     /** Gets the underlying `delegate` type. */
-    csharp::DelegateType getDelegateType() { result = dt }
+    CSharp::DelegateType getDelegateType() { result = dt }
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/xml/XPath.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/xml/XPath.qll
index 9374d7c282f..7e703f44608 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/xml/XPath.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/xml/XPath.qll
@@ -1,20 +1,20 @@
 /** Provides classes related to the namespace `System.Xml.XPath`. */
 
-import csharp as csharp
-private import semmle.code.csharp.frameworks.system.Xml as xml
+private import csharp as CSharp
+private import semmle.code.csharp.frameworks.system.Xml as Xml
 
 /** Definitions relating to the `System.Xml.XPath` namespace. */
 module SystemXmlXPath {
   /** The `System.Xml.XPath` namespace. */
-  class Namespace extends csharp::Namespace {
+  class Namespace extends CSharp::Namespace {
     Namespace() {
-      this.getParentNamespace() instanceof xml::SystemXmlNamespace and
+      this.getParentNamespace() instanceof Xml::SystemXmlNamespace and
       this.hasName("XPath")
     }
   }
 
   /** A class in the `System.Xml.XPath` namespace. */
-  class Class extends csharp::Class {
+  class Class extends CSharp::Class {
     Class() { this.getNamespace() instanceof Namespace }
   }
 
@@ -28,17 +28,17 @@ module SystemXmlXPath {
     XPathNavigator() { this.hasName("XPathNavigator") }
 
     /** Gets a method that selects nodes. */
-    csharp::Method getASelectMethod() {
+    CSharp::Method getASelectMethod() {
       result = this.getAMethod() and result.getName().matches("Select%")
     }
 
     /** Gets the `Compile` method. */
-    csharp::Method getCompileMethod() { result = this.getAMethod("Compile") }
+    CSharp::Method getCompileMethod() { result = this.getAMethod("Compile") }
 
     /** Gets an `Evaluate` method. */
-    csharp::Method getAnEvaluateMethod() { result = this.getAMethod("Evaluate") }
+    CSharp::Method getAnEvaluateMethod() { result = this.getAMethod("Evaluate") }
 
     /** Gets a `Matches` method. */
-    csharp::Method getAMatchesMethod() { result = this.getAMethod("Matches") }
+    CSharp::Method getAMatchesMethod() { result = this.getAMethod("Matches") }
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
index 34cff98208d..6b6b49e3a60 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
@@ -12,15 +12,18 @@ private import semmle.code.csharp.dataflow.FlowSummary
 /**
  * A callable that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPICallable extends Callable { }
+abstract class SafeExternalApiCallable extends Callable { }
 
-private class SummarizedCallableSafe extends SafeExternalAPICallable {
+/** DEPRECATED: Alias for SafeExternalApiCallable */
+deprecated class SafeExternalAPICallable = SafeExternalApiCallable;
+
+private class SummarizedCallableSafe extends SafeExternalApiCallable {
   SummarizedCallableSafe() { this instanceof SummarizedCallable }
 }
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPICallable extends SafeExternalAPICallable {
-  DefaultSafeExternalAPICallable() {
+private class DefaultSafeExternalApiCallable extends SafeExternalApiCallable {
+  DefaultSafeExternalApiCallable() {
     this instanceof EqualsMethod or
     this instanceof IEquatableEqualsMethod or
     this = any(SystemObjectClass s).getEqualsMethod() or
@@ -36,11 +39,11 @@ private class DefaultSafeExternalAPICallable extends SafeExternalAPICallable {
 }
 
 /** A node representing data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     (
       // Argument to call
       this.asExpr() = call.getArgument(i)
@@ -59,7 +62,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
       m.fromSource()
     ) and
     // Not a call to a known safe external API
-    not call.getTarget().getUnboundDeclaration() instanceof SafeExternalAPICallable
+    not call.getTarget().getUnboundDeclaration() instanceof SafeExternalApiCallable
   }
 
   /** Gets the called API callable. */
@@ -72,38 +75,47 @@ class ExternalAPIDataNode extends DataFlow::Node {
   string getCallableDescription() { result = this.getCallable().getQualifiedName() }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
-/** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  private UntrustedDataToExternalAPIConfig c;
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
 
-  UntrustedExternalAPIDataNode() { c.hasFlow(_, this) }
+/** A node representing untrusted data being passed to an external API. */
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  private UntrustedDataToExternalApiConfig c;
+
+  UntrustedExternalApiDataNode() { c.hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() { c.hasFlow(result, this) }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Callable m, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Callable m, int index) {
+    exists(UntrustedExternalApiDataNode n |
       m = n.getCallable().getUnboundDeclaration() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getCallable().getUnboundDeclaration(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getCallable().getUnboundDeclaration(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -116,10 +128,13 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Callable m, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(m, index) and
+      this = TExternalApiParameter(m, index) and
       result =
         m.getDeclaringType().getQualifiedName() + "." + m.toStringWithTypes() + " [" + indexString +
           "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
index 5aa27202f4f..6f985463763 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
@@ -117,12 +117,15 @@ class SearchRequestFilterSink extends Sink {
  *
  * This will match the encoding methods provided by the AntiXSS library.
  */
-class LDAPEncodeSanitizer extends Sanitizer {
-  LDAPEncodeSanitizer() {
+class LdapEncodeSanitizer extends Sanitizer {
+  LdapEncodeSanitizer() {
     this.getExpr().(MethodCall).getTarget().getName().regexpMatch("(?i)LDAP.*Encode.*")
   }
 }
 
+/** DEPRECATED: Alias for LdapEncodeSanitizer */
+deprecated class LDAPEncodeSanitizer = LdapEncodeSanitizer;
+
 private class SimpleTypeSanitizer extends Sanitizer, SimpleTypeSanitizedExpr { }
 
 private class GuidSanitizer extends Sanitizer, GuidSanitizedExpr { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
index cf27d2db49b..d49ecd7c900 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
@@ -28,10 +28,10 @@ abstract class Sink extends DataFlow::ExprNode {
   abstract string getReason();
 }
 
-private class InsecureXMLSink extends Sink {
+private class InsecureXmlSink extends Sink {
   private string reason;
 
-  InsecureXMLSink() {
+  InsecureXmlSink() {
     exists(InsecureXML::InsecureXmlProcessing r | r.isUnsafe(reason) |
       this.getExpr() = r.getAnArgument()
     )
diff --git a/csharp/ql/lib/semmle/code/dotnet/Declaration.qll b/csharp/ql/lib/semmle/code/dotnet/Declaration.qll
index 60e434f9ae6..046cb99944e 100644
--- a/csharp/ql/lib/semmle/code/dotnet/Declaration.qll
+++ b/csharp/ql/lib/semmle/code/dotnet/Declaration.qll
@@ -21,13 +21,6 @@ class Declaration extends NamedElement, @dotnet_declaration {
   /** Gets the type containing this declaration, if any. */
   Type getDeclaringType() { none() }
 
-  /**
-   * DEPRECATED: Use `getUnboundDeclaration()` instaed.
-   *
-   * Gets the unbound version of this declaration.
-   */
-  deprecated final Declaration getSourceDeclaration() { result = this.getUnboundDeclaration() }
-
   /**
    * Gets the unbound version of this declaration, that is, the declaration where
    * all type arguments have been removed. For example, in
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index ce70794f289..dc356239a96 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.0.11
+
+### Minor Analysis Improvements
+
+* Casts to `dynamic` are excluded from the useless upcasts check (`cs/useless-upcast`).
+* The C# extractor now accepts an extractor option `buildless`, which is used to decide what type of extraction that should be performed. If `true` then buildless (standalone) extraction will be performed. Otherwise tracing extraction will be performed (default).
+The option is added via `codeql database create --language=csharp -Obuildless=true ...`.
+* The C# extractor now accepts an extractor option `trap.compression`, which is used to decide the compression format for TRAP files. The legal values are `brotli` (default), `gzip` or `none`.
+The option is added via `codeql database create --language=csharp -Otrap.compression=value ...`.
+
 ## 0.0.10
 
 ### Query Metadata Changes
diff --git a/csharp/ql/src/Documentation/Documentation.qll b/csharp/ql/src/Documentation/Documentation.qll
index 19fd1d5dd8a..c15f53027c3 100644
--- a/csharp/ql/src/Documentation/Documentation.qll
+++ b/csharp/ql/src/Documentation/Documentation.qll
@@ -26,7 +26,7 @@ class SourceMethodOrConstructor extends SourceDeclaration, Callable {
 }
 
 /** Gets an XML comment bound to this declaration. */
-XmlComment getADeclarationXmlComment(Declaration d) {
+XmlCommentLine getADeclarationXmlComment(Declaration d) {
   result = getADeclarationCommentBlock(d).getAChild()
 }
 
@@ -58,7 +58,7 @@ predicate isDocumentationNeeded(Modifiable decl) {
 }
 
 /** An XML comment containing a `<returns>` tag. */
-class ReturnsXmlComment extends XmlComment {
+class ReturnsXmlComment extends XmlCommentLine {
   ReturnsXmlComment() { this.getOpenTag(_) = "returns" }
 
   /** Holds if the element in this comment has a body at offset `offset`. */
@@ -72,7 +72,7 @@ class ReturnsXmlComment extends XmlComment {
 }
 
 /** An XML comment containing an `<exception>` tag. */
-class ExceptionXmlComment extends XmlComment {
+class ExceptionXmlComment extends XmlCommentLine {
   ExceptionXmlComment() { this.getOpenTag(_) = "exception" }
 
   /** Gets a `cref` attribute at offset `offset`, if any. */
@@ -83,7 +83,7 @@ class ExceptionXmlComment extends XmlComment {
 }
 
 /** An XML comment containing a `<param>` tag. */
-class ParamXmlComment extends XmlComment {
+class ParamXmlComment extends XmlCommentLine {
   ParamXmlComment() { this.getOpenTag(_) = "param" }
 
   /** Gets the name of this parameter at offset `offset`. */
@@ -94,7 +94,7 @@ class ParamXmlComment extends XmlComment {
 }
 
 /** An XML comment containing a `<typeparam>` tag. */
-class TypeparamXmlComment extends XmlComment {
+class TypeparamXmlComment extends XmlCommentLine {
   TypeparamXmlComment() { this.getOpenTag(_) = "typeparam" }
 
   /** Gets the `name` attribute of this element at offset `offset`. */
@@ -105,7 +105,7 @@ class TypeparamXmlComment extends XmlComment {
 }
 
 /** An XML comment containing a `<summary>` tag. */
-class SummaryXmlComment extends XmlComment {
+class SummaryXmlComment extends XmlCommentLine {
   SummaryXmlComment() { this.getOpenTag(_) = "summary" }
 
   /** Holds if the element in this comment has a body at offset `offset`. */
@@ -119,6 +119,6 @@ class SummaryXmlComment extends XmlComment {
 }
 
 /** An XML comment containing an `<inheritdoc>` tag. */
-class InheritDocXmlComment extends XmlComment {
+class InheritDocXmlComment extends XmlCommentLine {
   InheritDocXmlComment() { this.getOpenTag(_) = "inheritdoc" }
 }
diff --git a/csharp/ql/src/Likely Bugs/EqualityCheckOnFloats.ql b/csharp/ql/src/Likely Bugs/EqualityCheckOnFloats.ql
index 5cbbbb83751..1884cd5cc5f 100644
--- a/csharp/ql/src/Likely Bugs/EqualityCheckOnFloats.ql	
+++ b/csharp/ql/src/Likely Bugs/EqualityCheckOnFloats.ql	
@@ -11,13 +11,6 @@
 
 import csharp
 
-class ZeroFloatLiteral extends FloatLiteral {
-  ZeroFloatLiteral() {
-    this.getValue() = "0" or
-    this.getValue() = "0.0"
-  }
-}
-
 from EqualityOperation e
 where
   e.getAnOperand().getType() instanceof FloatingPointType and
diff --git a/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql b/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql
index 3bccd9b0331..8477401fe17 100644
--- a/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql	
+++ b/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql	
@@ -17,7 +17,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebXMLElement web, XMLAttribute debugAttribute
+from SystemWebXmlElement web, XMLAttribute debugAttribute
 where
   debugAttribute = web.getAChild("compilation").getAttribute("debug") and
   not debugAttribute.getValue().toLowerCase() = "false"
diff --git a/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql b/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql
index 5a527c96084..d6b4da2c258 100644
--- a/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql	
+++ b/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql	
@@ -14,7 +14,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebXMLElement web, XMLAttribute maxReqLength
+from SystemWebXmlElement web, XMLAttribute maxReqLength
 where
   maxReqLength =
     web.getAChild(any(string s | s.toLowerCase() = "httpruntime"))
diff --git a/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql b/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql
index f093a888446..3a8208c270f 100644
--- a/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql	
+++ b/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql	
@@ -13,7 +13,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebXMLElement web, XMLAttribute requestvalidateAttribute
+from SystemWebXmlElement web, XMLAttribute requestvalidateAttribute
 where
   requestvalidateAttribute = web.getAChild("pages").getAttribute("validateRequest") and
   requestvalidateAttribute.getValue().toLowerCase() = "false"
diff --git a/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql b/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
index 8b6a657ecd4..b07b1093ec8 100644
--- a/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql	
+++ b/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql	
@@ -11,7 +11,7 @@
 import csharp
 import semmle.code.csharp.security.dataflow.ExternalAPIsQuery
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql b/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql
index 3db73db09d4..aaf18f7f312 100644
--- a/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql	
+++ b/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql	
@@ -14,8 +14,8 @@ import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.security.dataflow.ExternalAPIsQuery
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getCallableDescription() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getCallableDescription() +
     " with untrusted data from $@.", source, source.toString()
diff --git a/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql b/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql
index 416608b9115..1e7a9a4ddb1 100644
--- a/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql	
+++ b/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql	
@@ -24,7 +24,7 @@ class Application_Error extends Method {
   }
 }
 
-from CustomErrorsXMLElement customError
+from CustomErrorsXmlElement customError
 where
   // `<customErrors>` must be set to "off" to be dangerous
   customError.getAttributeValue("mode").toLowerCase() = "off" and
diff --git a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql
index 67f3ae1d7b8..9e51b663038 100644
--- a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
+++ b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
@@ -19,7 +19,7 @@ import semmle.code.csharp.frameworks.system.Web
 /**
  * Holds if the `Web.config` file `webConfig` adds an `X-Frame-Options` header.
  */
-predicate hasWebConfigXFrameOptions(WebConfigXML webConfig) {
+predicate hasWebConfigXFrameOptions(WebConfigXml webConfig) {
   // Looking for an entry in `webConfig` that looks like this:
   // ```xml
   // <system.webServer>
@@ -52,7 +52,7 @@ predicate hasCodeXFrameOptions() {
   )
 }
 
-from WebConfigXML webConfig
+from WebConfigXml webConfig
 where
   not hasWebConfigXFrameOptions(webConfig) and
   not hasCodeXFrameOptions()
diff --git a/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql b/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql
index 9416fa32f0a..2337ecfc4cf 100644
--- a/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql	
+++ b/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql	
@@ -13,7 +13,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebServerXMLElement ws, XMLAttribute a
+from SystemWebServerXmlElement ws, XMLAttribute a
 where
   ws.getAChild("directoryBrowse").getAttribute("enabled") = a and
   a.getValue() = "true"
diff --git a/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql b/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql
index 631b408a5a3..5d0958d06f9 100644
--- a/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql	
+++ b/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql	
@@ -27,7 +27,7 @@ where
   )
   or
   // header checking is disabled in a configuration file
-  exists(HttpRuntimeXMLElement e, XMLAttribute a |
+  exists(HttpRuntimeXmlElement e, XMLAttribute a |
     a = e.getAttribute("enableHeaderChecking") and
     a.getValue().toLowerCase() = "false" and
     a = l
diff --git a/csharp/ql/src/change-notes/2022-02-23-extractor-option-compression.md b/csharp/ql/src/change-notes/2022-02-23-extractor-option-compression.md
deleted file mode 100644
index 533426ec2e7..00000000000
--- a/csharp/ql/src/change-notes/2022-02-23-extractor-option-compression.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* The C# extractor now accepts an extractor option `trap.compression`, which is used to decide the compression format for TRAP files. The legal values are `brotli` (default), `gzip` or `none`.
-The option is added via `codeql database create --language=csharp -Otrap.compression=value ...`.
diff --git a/csharp/ql/src/change-notes/2022-02-24-buildless-extractor-option.md b/csharp/ql/src/change-notes/2022-02-24-buildless-extractor-option.md
deleted file mode 100644
index 84dc3281a20..00000000000
--- a/csharp/ql/src/change-notes/2022-02-24-buildless-extractor-option.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* The C# extractor now accepts an extractor option `buildless`, which is used to decide what type of extraction that should be performed. If `true` then buildless (standalone) extraction will be performed. Otherwise tracing extraction will be performed (default).
-The option is added via `codeql database create --language=csharp -Obuildless=true ...`.
\ No newline at end of file
diff --git a/csharp/ql/src/change-notes/2022-02-28-useless-upcast.md b/csharp/ql/src/change-notes/2022-02-28-useless-upcast.md
deleted file mode 100644
index b3d2462f803..00000000000
--- a/csharp/ql/src/change-notes/2022-02-28-useless-upcast.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Casts to `dynamic` are excluded from the useless upcasts check (`cs/useless-upcast`).
\ No newline at end of file
diff --git a/csharp/ql/src/change-notes/released/0.0.11.md b/csharp/ql/src/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..68db1093830
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/0.0.11.md
@@ -0,0 +1,9 @@
+## 0.0.11
+
+### Minor Analysis Improvements
+
+* Casts to `dynamic` are excluded from the useless upcasts check (`cs/useless-upcast`).
+* The C# extractor now accepts an extractor option `buildless`, which is used to decide what type of extraction that should be performed. If `true` then buildless (standalone) extraction will be performed. Otherwise tracing extraction will be performed (default).
+The option is added via `codeql database create --language=csharp -Obuildless=true ...`.
+* The C# extractor now accepts an extractor option `trap.compression`, which is used to decide the compression format for TRAP files. The legal values are `brotli` (default), `gzip` or `none`.
+The option is added via `codeql database create --language=csharp -Otrap.compression=value ...`.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll b/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll
index 4b3f19cbdde..5a7099d9fa2 100644
--- a/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll
@@ -19,24 +19,24 @@ newtype TInstruction =
   ) {
     IRConstruction::Raw::hasInstruction(tag1, tag2)
   } or
-  TUnaliasedSSAPhiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+  TUnaliasedSsaPhiInstruction(
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    UnaliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
+    UnaliasedSsa::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TUnaliasedSSAChiInstruction(TRawInstruction primaryInstruction) { none() } or
-  TUnaliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
-    UnaliasedSSA::SSA::hasUnreachedInstruction(irFunc)
+  TUnaliasedSsaChiInstruction(TRawInstruction primaryInstruction) { none() } or
+  TUnaliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
+    UnaliasedSsa::SSA::hasUnreachedInstruction(irFunc)
   } or
-  TAliasedSSAPhiInstruction(
+  TAliasedSsaPhiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
     AliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TAliasedSSAChiInstruction(TRawInstruction primaryInstruction) {
+  TAliasedSsaChiInstruction(TRawInstruction primaryInstruction) {
     AliasedSSA::SSA::hasChiInstruction(primaryInstruction)
   } or
-  TAliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
+  TAliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
     AliasedSSA::SSA::hasUnreachedInstruction(irFunc)
   }
 
@@ -46,58 +46,64 @@ newtype TInstruction =
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAInstructions {
-  class TPhiInstruction = TUnaliasedSSAPhiInstruction;
+module UnaliasedSsaInstructions {
+  class TPhiInstruction = TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TRawInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) { none() }
 
-  class TChiInstruction = TUnaliasedSSAChiInstruction;
+  class TChiInstruction = TUnaliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TUnaliasedSSAChiInstruction(primaryInstruction)
+    result = TUnaliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TUnaliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TUnaliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TUnaliasedSSAUnreachedInstruction(irFunc)
+    result = TUnaliasedSsaUnreachedInstruction(irFunc)
   }
 }
 
+/** DEPRECATED: Alias for UnaliasedSsaInstructions */
+deprecated module UnaliasedSSAInstructions = UnaliasedSsaInstructions;
+
 /**
  * Provides wrappers for the constructors of each branch of `TInstruction` that is used by the
  * aliased SSA stage.
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module AliasedSSAInstructions {
-  class TPhiInstruction = TAliasedSSAPhiInstruction or TUnaliasedSSAPhiInstruction;
+module AliasedSsaInstructions {
+  class TPhiInstruction = TAliasedSsaPhiInstruction or TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
-    result = TAliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TAliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TPhiInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, _)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, _)
   }
 
-  class TChiInstruction = TAliasedSSAChiInstruction;
+  class TChiInstruction = TAliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TAliasedSSAChiInstruction(primaryInstruction)
+    result = TAliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TAliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TAliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TAliasedSSAUnreachedInstruction(irFunc)
+    result = TAliasedSsaUnreachedInstruction(irFunc)
   }
 }
+
+/** DEPRECATED: Alias for AliasedSsaInstructions */
+deprecated module AliasedSSAInstructions = AliasedSsaInstructions;
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll b/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll
index 978d2c41aa7..252f390bf55 100644
--- a/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll
@@ -1,4 +1,4 @@
 import experimental.ir.internal.IRCSharpLanguage as Language
 import experimental.ir.implementation.raw.internal.IRConstruction as IRConstruction
-import experimental.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSSA
+import experimental.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSsa
 import AliasedSSAStub as AliasedSSA
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll b/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll
index 20fe77f8223..6327c603901 100644
--- a/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll
+++ b/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll
@@ -29,7 +29,7 @@ private module Internal {
     TNoOperand() { none() } or
     // Can be "removed" later when there's unreachable code
     // These operands can be reused across all three stages. They just get different defs.
-    TNonSSAMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
+    TNonSsaMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
       // Has no definition in raw but will get definitions later
       useInstr.getOpcode().hasOperand(tag)
     } or
@@ -57,13 +57,21 @@ private module Shared {
     result = Internal::TRegisterOperand(useInstr, tag, defInstr)
   }
 
-  class TNonSSAMemoryOperand = Internal::TNonSSAMemoryOperand;
+  class TNonSsaMemoryOperand = Internal::TNonSsaMemoryOperand;
+
+  /** DEPRECATED: Alias for TNonSsaMemoryOperand */
+  deprecated class TNonSSAMemoryOperand = TNonSsaMemoryOperand;
 
   /**
    * Returns the non-Phi memory operand with the specified parameters.
    */
-  TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
-    result = Internal::TNonSSAMemoryOperand(useInstr, tag)
+  TNonSsaMemoryOperand nonSsaMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = Internal::TNonSsaMemoryOperand(useInstr, tag)
+  }
+
+  /** DEPRECATED: Alias for nonSsaMemoryOperand */
+  deprecated TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = nonSsaMemoryOperand(useInstr, tag)
   }
 }
 
@@ -80,7 +88,7 @@ module RawOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -114,14 +122,14 @@ module RawOperands {
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAOperands {
+module UnaliasedSsaOperands {
   import Shared
 
   class TPhiOperand = Internal::TUnaliasedPhiOperand;
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -148,3 +156,6 @@ module UnaliasedSSAOperands {
    */
   TChiOperand chiOperand(Unaliased::Instruction useInstr, ChiOperandTag tag) { none() }
 }
+
+/** DEPRECATED: Alias for UnaliasedSsaOperands */
+deprecated module UnaliasedSSAOperands = UnaliasedSsaOperands;
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll b/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
index 1c2cc493338..e5a908bbf9a 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll b/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
index 956a95e0667..032026e7969 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
@@ -62,7 +62,7 @@ module Raw {
     Callable callable, Language::AST ast, TempVariableTag tag, CSharpType type
   ) {
     exists(TranslatedElement element |
-      element.getAST() = ast and
+      element.getAst() = ast and
       callable = element.getFunction() and
       element.hasTempVariable(tag, type)
     )
@@ -105,7 +105,7 @@ module Raw {
       tag = getInstructionTag(instruction) and
       (
         result = element.getInstructionVariable(tag) or
-        result.(IRStringLiteral).getAST() = element.getInstructionStringLiteral(tag)
+        result.(IRStringLiteral).getAst() = element.getInstructionStringLiteral(tag)
       )
     )
   }
@@ -357,7 +357,7 @@ private module Cached {
     exists(TranslatedElement s, GotoStmt goto |
       goto instanceof GotoStmt and
       not isStrictlyForwardGoto(goto) and
-      goto = s.getAST() and
+      goto = s.getAst() and
       exists(InstructionTag tag |
         result = s.getInstructionSuccessor(tag, kind) and
         instruction = s.getInstruction(tag)
@@ -372,8 +372,14 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instruction) {
-    result = getInstructionTranslatedElement(instruction).getAST()
+  Language::AST getInstructionAst(Instruction instruction) {
+    result = getInstructionTranslatedElement(instruction).getAst()
+  }
+
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instruction) {
+    result = getInstructionAst(instruction)
   }
 
   cached
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll
index 99833c70d0b..fe555344b2f 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll
@@ -15,7 +15,10 @@ abstract class TranslatedCondition extends ConditionBase {
 
   final override string toString() { result = expr.toString() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   final Expr getExpr() { result = expr }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll
index 9b4fbbba723..74d72f4f438 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll
@@ -14,7 +14,7 @@ private import common.TranslatedDeclarationBase
  * `entry`.
  */
 TranslatedLocalDeclaration getTranslatedLocalDeclaration(LocalVariableDeclExpr declExpr) {
-  result.getAST() = declExpr
+  result.getAst() = declExpr
 }
 
 /**
@@ -29,7 +29,10 @@ abstract class TranslatedLocalDeclaration extends TranslatedElement, TTranslated
 
   final override string toString() { result = expr.toString() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
index ea1ad7931cb..d44b2f453f1 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
@@ -27,7 +27,7 @@ IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var
 }
 
 IRTempVariable getIRTempVariable(Language::AST ast, TempVariableTag tag) {
-  result.getAST() = ast and
+  result.getAst() = ast and
   result.getTag() = tag
 }
 
@@ -365,7 +365,10 @@ abstract class TranslatedElement extends TTranslatedElement {
   /**
    * Gets the AST node being translated.
    */
-  abstract Language::AST getAST();
+  abstract Language::AST getAst();
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = this.getAst() }
 
   /**
    * Get the first instruction to be executed in the evaluation of this element.
@@ -558,7 +561,7 @@ abstract class TranslatedElement extends TTranslatedElement {
    * Gets the temporary variable generated by this element with tag `tag`.
    */
   final IRTempVariable getTempVariable(TempVariableTag tag) {
-    result.getAST() = this.getAST() and
+    result.getAst() = this.getAst() and
     result.getTag() = tag and
     this.hasTempVariable(tag, _)
   }
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 4f4c1a5f073..a3327d6775c 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -62,7 +62,10 @@ abstract class TranslatedExpr extends TranslatedExprBase {
    */
   final Type getResultType() { result = expr.getType() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   final override Callable getFunction() { result = expr.getEnclosingCallable() }
 
@@ -577,9 +580,9 @@ class TranslatedArrayAccess extends TranslatedNonConstantExpr {
     result = this.getInstruction(ElementsAddressTag(0))
     or
     // The successor of an offset expression is a `PointerAdd` expression.
-    child = this.getOffsetOperand(child.getAST().getIndex()) and
-    child.getAST().getIndex() >= 0 and
-    result = this.getInstruction(PointerAddTag(child.getAST().getIndex()))
+    child = this.getOffsetOperand(child.getAst().getIndex()) and
+    child.getAst().getIndex() >= 0 and
+    result = this.getInstruction(PointerAddTag(child.getAst().getIndex()))
   }
 
   override Instruction getResult() {
@@ -2039,7 +2042,7 @@ class TranslatedObjectCreation extends TranslatedCreation {
     // Since calls are also expressions, we can't
     // use the predicate getTranslatedExpr (since that would
     // also return `this`).
-    result.getAST() = this.getAST()
+    result.getAst() = this.getAst()
   }
 
   override predicate needsLoad() { expr.getObjectType().isValueType() }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll
index 94b48b0985d..24f340a8718 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll
@@ -15,7 +15,7 @@ private import experimental.ir.internal.IRCSharpLanguage as Language
 /**
  * Gets the `TranslatedFunction` that represents function `callable`.
  */
-TranslatedFunction getTranslatedFunction(Callable callable) { result.getAST() = callable }
+TranslatedFunction getTranslatedFunction(Callable callable) { result.getAst() = callable }
 
 /**
  * Represents the IR translation of a function. This is the root element for
@@ -28,7 +28,10 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
 
   final override string toString() { result = callable.toString() }
 
-  final override Language::AST getAST() { result = callable }
+  final override Language::AST getAst() { result = callable }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the function being translated.
@@ -269,7 +272,7 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
 /**
  * Gets the `TranslatedParameter` that represents parameter `param`.
  */
-TranslatedParameter getTranslatedParameter(Parameter param) { result.getAST() = param }
+TranslatedParameter getTranslatedParameter(Parameter param) { result.getAst() = param }
 
 /**
  * Represents the IR translation of a function parameter, including the
@@ -282,7 +285,10 @@ class TranslatedParameter extends TranslatedElement, TTranslatedParameter {
 
   final override string toString() { result = param.toString() }
 
-  final override Language::AST getAST() { result = param }
+  final override Language::AST getAst() { result = param }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   final override Callable getFunction() { result = param.getCallable() }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
index 77e41c15e72..3df60c9f80d 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
@@ -51,7 +51,10 @@ abstract class TranslatedInitialization extends TranslatedElement, TTranslatedIn
 
   final override Callable getFunction() { result = expr.getEnclosingCallable() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the expression that is doing the initialization.
@@ -206,7 +209,10 @@ abstract class TranslatedElementInitialization extends TranslatedElement {
     result = initList.toString() + "[" + this.getElementIndex().toString() + "]"
   }
 
-  final override Language::AST getAST() { result = initList }
+  final override Language::AST getAst() { result = initList }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   final override Callable getFunction() { result = initList.getEnclosingCallable() }
 
@@ -310,7 +316,10 @@ abstract class TranslatedConstructorCallFromConstructor extends TranslatedElemen
   ConstructorCallContext {
   Call call;
 
-  final override Language::AST getAST() { result = call }
+  final override Language::AST getAst() { result = call }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   final override TranslatedElement getChild(int id) {
     id = 0 and result = this.getConstructorCall()
@@ -327,7 +336,7 @@ abstract class TranslatedConstructorCallFromConstructor extends TranslatedElemen
 }
 
 TranslatedConstructorInitializer getTranslatedConstructorInitializer(ConstructorInitializer ci) {
-  result.getAST() = ci
+  result.getAst() = ci
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll
index ac69a9c0f28..d95a73e4e42 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -15,7 +15,7 @@ private import experimental.ir.internal.IRUtilities
 private import desugar.Foreach
 private import desugar.Lock
 
-TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAST() = stmt }
+TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAst() = stmt }
 
 abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
   Stmt stmt;
@@ -24,7 +24,10 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
 
   final override string toString() { result = stmt.toString() }
 
-  final override Language::AST getAST() { result = stmt }
+  final override Language::AST getAst() { result = stmt }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = this.getAst() }
 
   final override Callable getFunction() { result = stmt.getEnclosingCallable() }
 }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll
index f7c80e497fa..5e51073900e 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll
@@ -27,10 +27,10 @@ private import experimental.ir.implementation.raw.internal.common.TranslatedExpr
  */
 module DelegateElements {
   TranslatedDelegateConstructorCall getConstructor(DelegateCreation generatedBy) {
-    result.getAST() = generatedBy
+    result.getAst() = generatedBy
   }
 
-  TranslatedDelegateInvokeCall getInvoke(DelegateCall generatedBy) { result.getAST() = generatedBy }
+  TranslatedDelegateInvokeCall getInvoke(DelegateCall generatedBy) { result.getAst() = generatedBy }
 
   int noGeneratedElements(Element generatedBy) {
     (
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll
index 195072ed124..bc8ec748648 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll
@@ -56,9 +56,9 @@ private import internal.TranslatedCompilerGeneratedElement
  * Module that exposes the functions needed for the translation of the `foreach` stmt.
  */
 module ForeachElements {
-  TranslatedForeachTry getTry(ForeachStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedForeachTry getTry(ForeachStmt generatedBy) { result.getAst() = generatedBy }
 
-  TranslatedForeachEnumerator getEnumDecl(ForeachStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedForeachEnumerator getEnumDecl(ForeachStmt generatedBy) { result.getAst() = generatedBy }
 
   int noGeneratedElements() { result = 13 }
 }
@@ -71,14 +71,14 @@ private class TranslatedForeachTry extends TranslatedCompilerGeneratedTry,
 
   override TranslatedElement getFinally() {
     exists(TranslatedForeachFinally ff |
-      ff.getAST() = generatedBy and
+      ff.getAst() = generatedBy and
       result = ff
     )
   }
 
   override TranslatedElement getBody() {
     exists(TranslatedForeachWhile fw |
-      fw.getAST() = generatedBy and
+      fw.getAst() = generatedBy and
       result = fw
     )
   }
@@ -96,7 +96,7 @@ private class TranslatedForeachFinally extends TranslatedCompilerGeneratedBlock,
   override TranslatedElement getStmt(int index) {
     index = 0 and
     exists(TranslatedForeachDispose fd |
-      fd.getAST() = generatedBy and
+      fd.getAst() = generatedBy and
       result = fd
     )
   }
@@ -147,14 +147,14 @@ class TranslatedForeachWhile extends TranslatedCompilerGeneratedStmt, ConditionC
 
   TranslatedElement getInit() {
     exists(TranslatedForeachIterVar iv |
-      iv.getAST() = generatedBy and
+      iv.getAst() = generatedBy and
       result = iv
     )
   }
 
   ValueConditionBase getCondition() {
     exists(TranslatedForeachWhileCondition cond |
-      cond.getAST() = generatedBy and
+      cond.getAst() = generatedBy and
       result = cond
     )
   }
@@ -180,7 +180,7 @@ private class TranslatedForeachMoveNext extends TranslatedCompilerGeneratedCall,
 
   override TranslatedExprBase getQualifier() {
     exists(TranslatedMoveNextEnumAcc acc |
-      acc.getAST() = generatedBy and
+      acc.getAst() = generatedBy and
       result = acc
     )
   }
@@ -230,7 +230,7 @@ private class TranslatedForeachCurrent extends TranslatedCompilerGeneratedCall,
 
   override TranslatedExprBase getQualifier() {
     exists(TranslatedForeachCurrentEnumAcc acc |
-      acc.getAST() = generatedBy and
+      acc.getAst() = generatedBy and
       result = acc
     )
   }
@@ -263,7 +263,7 @@ private class TranslatedForeachDispose extends TranslatedCompilerGeneratedCall,
 
   override TranslatedExprBase getQualifier() {
     exists(TranslatedForeachDisposeEnumAcc acc |
-      acc.getAST() = generatedBy and
+      acc.getAst() = generatedBy and
       result = acc
     )
   }
@@ -282,7 +282,7 @@ private class TranslatedForeachWhileCondition extends TranslatedCompilerGenerate
 
   override TranslatedCompilerGeneratedCall getValueExpr() {
     exists(TranslatedForeachMoveNext mn |
-      mn.getAST() = generatedBy and
+      mn.getAst() = generatedBy and
       result = mn
     )
   }
@@ -311,7 +311,7 @@ private class TranslatedForeachEnumerator extends TranslatedCompilerGeneratedDec
 
   override TranslatedCompilerGeneratedCall getInitialization() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge
     )
   }
@@ -339,7 +339,7 @@ private class TranslatedForeachIterVar extends TranslatedCompilerGeneratedDeclar
 
   override TranslatedCompilerGeneratedCall getInitialization() {
     exists(TranslatedForeachCurrent crtProp |
-      crtProp.getAST() = generatedBy and
+      crtProp.getAst() = generatedBy and
       result = crtProp
     )
   }
@@ -361,7 +361,7 @@ private class TranslatedMoveNextEnumAcc extends TTranslatedCompilerGeneratedElem
 
   override Type getVariableType() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge.getCallResultType()
     )
   }
@@ -393,7 +393,7 @@ private class TranslatedForeachCurrentEnumAcc extends TTranslatedCompilerGenerat
 
   override Type getVariableType() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge.getCallResultType()
     )
   }
@@ -425,7 +425,7 @@ private class TranslatedForeachDisposeEnumAcc extends TTranslatedCompilerGenerat
 
   override Type getVariableType() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge.getCallResultType()
     )
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll
index c83957d9b94..e061a1371b2 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll
@@ -42,12 +42,12 @@ private import internal.TranslatedCompilerGeneratedExpr
  * Module that exposes the functions needed for the translation of the `lock` stmt.
  */
 module LockElements {
-  TranslatedLockedVarDecl getLockedVarDecl(LockStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedLockedVarDecl getLockedVarDecl(LockStmt generatedBy) { result.getAst() = generatedBy }
 
-  TranslatedLockTry getTry(LockStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedLockTry getTry(LockStmt generatedBy) { result.getAst() = generatedBy }
 
   TranslatedLockWasTakenDecl getLockWasTakenDecl(LockStmt generatedBy) {
-    result.getAST() = generatedBy
+    result.getAst() = generatedBy
   }
 
   int noGeneratedElements() { result = 14 }
@@ -64,14 +64,14 @@ private class TranslatedLockTry extends TranslatedCompilerGeneratedTry,
 
   override TranslatedElement getFinally() {
     exists(TranslatedLockFinally fin |
-      fin.getAST() = generatedBy and
+      fin.getAst() = generatedBy and
       result = fin
     )
   }
 
   override TranslatedElement getBody() {
     exists(TranslatedLockTryBody ltb |
-      ltb.getAST() = generatedBy and
+      ltb.getAst() = generatedBy and
       result = ltb
     )
   }
@@ -89,7 +89,7 @@ private class TranslatedLockTryBody extends TranslatedCompilerGeneratedBlock,
   override TranslatedElement getStmt(int index) {
     index = 0 and
     exists(TranslatedMonitorEnter me |
-      me.getAST() = generatedBy and
+      me.getAst() = generatedBy and
       result = me
     )
     or
@@ -110,7 +110,7 @@ private class TranslatedLockFinally extends TranslatedCompilerGeneratedBlock,
   override TranslatedElement getStmt(int index) {
     index = 0 and
     exists(TranslatedFinallyIf fif |
-      fif.getAST() = generatedBy and
+      fif.getAst() = generatedBy and
       result = fif
     )
   }
@@ -138,7 +138,7 @@ private class TranslatedMonitorExit extends TranslatedCompilerGeneratedCall,
   override TranslatedExprBase getArgument(int id) {
     id = 0 and
     exists(TranslatedMonitorExitVarAcc var |
-      var.getAST() = generatedBy and
+      var.getAst() = generatedBy and
       result = var
     )
   }
@@ -170,13 +170,13 @@ private class TranslatedMonitorEnter extends TranslatedCompilerGeneratedCall,
   override TranslatedExprBase getArgument(int id) {
     id = 0 and
     exists(TranslatedMonitorEnterVarAcc var |
-      var.getAST() = generatedBy and
+      var.getAst() = generatedBy and
       result = var
     )
     or
     id = 1 and
     exists(TranslatedLockWasTakenRefArg refArg |
-      refArg.getAST() = generatedBy and
+      refArg.getAst() = generatedBy and
       result = refArg
     )
   }
@@ -197,7 +197,7 @@ private class TranslatedIfCondition extends TranslatedCompilerGeneratedValueCond
 
   override TranslatedCompilerGeneratedExpr getValueExpr() {
     exists(TranslatedLockWasTakenCondVarAcc condVar |
-      condVar.getAST() = generatedBy and
+      condVar.getAst() = generatedBy and
       result = condVar
     )
   }
@@ -216,14 +216,14 @@ private class TranslatedFinallyIf extends TranslatedCompilerGeneratedIfStmt,
 
   override TranslatedCompilerGeneratedValueCondition getCondition() {
     exists(TranslatedIfCondition cond |
-      cond.getAST() = generatedBy and
+      cond.getAst() = generatedBy and
       result = cond
     )
   }
 
   override TranslatedCompilerGeneratedCall getThen() {
     exists(TranslatedMonitorExit me |
-      me.getAST() = generatedBy and
+      me.getAst() = generatedBy and
       result = me
     )
   }
@@ -271,7 +271,7 @@ private class TranslatedLockWasTakenDecl extends TranslatedCompilerGeneratedDecl
 
   override TranslatedCompilerGeneratedExpr getInitialization() {
     exists(TranslatedWasTakenConst const |
-      const.getAST() = generatedBy and
+      const.getAst() = generatedBy and
       result = const
     )
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll
index 1eb7520eda4..ffcc400a9bc 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll
@@ -18,5 +18,8 @@ abstract class TranslatedCompilerGeneratedElement extends TranslatedElement,
 
   final override Callable getFunction() { result = generatedBy.getEnclosingCallable() }
 
-  final override Language::AST getAST() { result = generatedBy }
+  final override Language::AST getAst() { result = generatedBy }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/reachability/DominanceInternal.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/reachability/DominanceInternal.qll
index cee8fa1543b..aaa4cc7bd53 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/reachability/DominanceInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/reachability/DominanceInternal.qll
@@ -1,7 +1,5 @@
 private import ReachableBlock as Reachability
 
-private module ReachabilityGraph = Reachability::Graph;
-
 module Graph {
   import Reachability::Graph
 
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
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 1c2cc493338..e5a908bbf9a 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = this.getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
index 88a4e6f8551..e522599abe9 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
@@ -1,2 +1,2 @@
 private import experimental.ir.implementation.internal.TOperand
-import UnaliasedSSAOperands
+import UnaliasedSsaOperands
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
index 72bb239c153..c7487872512 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
@@ -2,7 +2,7 @@ private import SSAConstructionInternal
 private import OldIR
 private import Alias
 private import SSAConstruction
-private import DebugSSA
+private import DebugSsa
 
 bindingset[offset]
 private string getKeySuffixForOffset(int offset) {
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
index 5686bb439eb..1c75529be00 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
@@ -1,2 +1,2 @@
 private import SSAConstruction as SSA
-import SSA::SSAConsistency
+import SSA::SsaConsistency
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
index 5092e921cb3..13ec2ca4ca4 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -112,7 +112,7 @@ private module Cached {
     exists(Alias::getResultMemoryLocation(oldInstruction))
     or
     // This result was already modeled by a previous iteration of SSA.
-    Alias::canReuseSSAForOldResult(oldInstruction)
+    Alias::canReuseSsaForOldResult(oldInstruction)
   }
 
   cached
@@ -182,7 +182,7 @@ private module Cached {
    * unreachable, this predicate will recurse through any degenerate `Phi` instructions to find the
    * true definition.
    */
-  private Instruction getNewDefinitionFromOldSSA(OldIR::MemoryOperand oldOperand, Overlap overlap) {
+  private Instruction getNewDefinitionFromOldSsa(OldIR::MemoryOperand oldOperand, Overlap overlap) {
     exists(Overlap originalOverlap |
       originalOverlap = oldOperand.getDefinitionOverlap() and
       (
@@ -191,7 +191,7 @@ private module Cached {
         or
         exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
           phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
-          result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
+          result = getNewDefinitionFromOldSsa(phiOperand, phiOperandOverlap) and
           overlap =
             combineOverlap(pragma[only_bind_out](phiOperandOverlap),
               pragma[only_bind_out](originalOverlap))
@@ -233,7 +233,7 @@ private module Cached {
     )
     or
     exists(OldIR::NonPhiMemoryOperand oldOperand |
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap) and
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap) and
       oldOperand.getUse() = instruction and
       tag = oldOperand.getOperandTag()
     )
@@ -307,13 +307,13 @@ private module Cached {
    * Gets the new definition instruction for the operand of `instr` that flows from the block
    * `newPredecessorBlock`, based on that operand's definition in the old IR.
    */
-  private Instruction getNewPhiOperandDefinitionFromOldSSA(
+  private Instruction getNewPhiOperandDefinitionFromOldSsa(
     Instruction instr, IRBlock newPredecessorBlock, Overlap overlap
   ) {
     exists(OldIR::PhiInstruction oldPhi, OldIR::PhiInputOperand oldOperand |
       oldPhi = getOldInstruction(instr) and
       oldOperand = oldPhi.getInputOperand(getOldBlock(newPredecessorBlock)) and
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap)
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap)
     )
   }
 
@@ -333,7 +333,7 @@ private module Cached {
       overlap = Alias::getOverlap(actualDefLocation, useLocation)
     )
     or
-    result = getNewPhiOperandDefinitionFromOldSSA(instr, newPredecessorBlock, overlap)
+    result = getNewPhiOperandDefinitionFromOldSsa(instr, newPredecessorBlock, overlap)
   }
 
   cached
@@ -412,17 +412,17 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instr) {
-    result = getOldInstruction(instr).getAST()
+  Language::AST getInstructionAst(Instruction instr) {
+    result = getOldInstruction(instr).getAst()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(blockStartInstr, _) and
-      result = blockStartInstr.getAST()
+      result = blockStartInstr.getAst()
     )
     or
     exists(RawIR::Instruction primaryInstr |
       instr = chiInstruction(primaryInstr) and
-      result = primaryInstr.getAST()
+      result = primaryInstr.getAst()
     )
     or
     exists(IRFunctionBase irFunc |
@@ -430,6 +430,12 @@ private module Cached {
     )
   }
 
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instr) {
+    result = getInstructionAst(instr)
+  }
+
   cached
   Language::LanguageType getInstructionResultType(Instruction instr) {
     result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -975,35 +981,41 @@ module DefUse {
   }
 }
 
-predicate canReuseSSAForMemoryResult(Instruction instruction) {
+predicate canReuseSsaForMemoryResult(Instruction instruction) {
   exists(OldInstruction oldInstruction |
     oldInstruction = getOldInstruction(instruction) and
     (
       // The previous iteration said it was reusable, so we should mark it as reusable as well.
-      Alias::canReuseSSAForOldResult(oldInstruction)
+      Alias::canReuseSsaForOldResult(oldInstruction)
       or
       // The current alias analysis says it is reusable.
-      Alias::getResultMemoryLocation(oldInstruction).canReuseSSA()
+      Alias::getResultMemoryLocation(oldInstruction).canReuseSsa()
     )
   )
   or
   exists(Alias::MemoryLocation defLocation |
     // This is a `Phi` for a reusable location, so the result of the `Phi` is reusable as well.
     instruction = phiInstruction(_, defLocation) and
-    defLocation.canReuseSSA()
+    defLocation.canReuseSsa()
   )
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
+deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
+
 /**
  * Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
  * `DebugSSA` module, which is then imported by PrintSSA.
  */
-module DebugSSA {
+module DebugSsa {
   import PhiInsertion
   import DefUse
 }
 
+/** DEPRECATED: Alias for DebugSsa */
+deprecated module DebugSSA = DebugSsa;
+
 import CachedForDebugging
 
 cached
@@ -1038,7 +1050,7 @@ private module CachedForDebugging {
 
   private OldIR::IRTempVariable getOldTempVariable(IRTempVariable var) {
     result.getEnclosingFunction() = var.getEnclosingFunction() and
-    result.getAST() = var.getAST() and
+    result.getAst() = var.getAst() and
     result.getTag() = var.getTag()
   }
 
@@ -1061,7 +1073,7 @@ private module CachedForDebugging {
   int maxValue() { result = 2147483647 }
 }
 
-module SSAConsistency {
+module SsaConsistency {
   /**
    * Holds if a `MemoryOperand` has more than one `MemoryLocation` assigned by alias analysis.
    */
@@ -1114,6 +1126,9 @@ module SSAConsistency {
   }
 }
 
+/** DEPRECATED: Alias for SsaConsistency */
+deprecated module SSAConsistency = SsaConsistency;
+
 /**
  * Provides the portion of the parameterized IR interface that is used to construct the SSA stages
  * of the IR. The raw stage of the IR does not expose these predicates.
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
index 8f726b81345..005ea53b018 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
@@ -3,7 +3,7 @@ import experimental.ir.implementation.raw.internal.reachability.ReachableBlock a
 import experimental.ir.implementation.raw.internal.reachability.Dominance as Dominance
 import experimental.ir.implementation.unaliased_ssa.IR as NewIR
 import experimental.ir.implementation.raw.internal.IRConstruction as RawStage
-import experimental.ir.implementation.internal.TInstruction::UnaliasedSSAInstructions as SSAInstructions
+import experimental.ir.implementation.internal.TInstruction::UnaliasedSsaInstructions as SSAInstructions
 import experimental.ir.internal.IRCSharpLanguage as Language
 import SimpleSSA as Alias
-import experimental.ir.implementation.internal.TOperand::UnaliasedSSAOperands as SSAOperands
+import experimental.ir.implementation.internal.TOperand::UnaliasedSsaOperands as SSAOperands
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
index f3e02c9f6a8..ec2e6f5ef34 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
@@ -41,11 +41,14 @@ predicate isVariableModeled(Allocation var) {
  * subsequent iterations will recompute SSA for any variable that we assumed did not escape, but
  * actually would have escaped if we had used a sound escape analysis.
  */
-predicate canReuseSSAForVariable(IRAutomaticVariable var) {
+predicate canReuseSsaForVariable(IRAutomaticVariable var) {
   isVariableModeled(var) and
   not allocationEscapes(var)
 }
 
+/** DEPRECATED: Alias for canReuseSsaForVariable */
+deprecated predicate canReuseSSAForVariable = canReuseSsaForVariable/1;
+
 private newtype TMemoryLocation = MkMemoryLocation(Allocation var) { isVariableModeled(var) }
 
 private MemoryLocation getMemoryLocation(Allocation var) { result.getAllocation() = var }
@@ -69,10 +72,16 @@ class MemoryLocation extends TMemoryLocation {
 
   final string getUniqueId() { result = var.getUniqueId() }
 
-  final predicate canReuseSSA() { canReuseSSAForVariable(var) }
+  final predicate canReuseSsa() { canReuseSsaForVariable(var) }
+
+  /** DEPRECATED: Alias for canReuseSsa */
+  deprecated predicate canReuseSSA() { canReuseSsa() }
 }
 
-predicate canReuseSSAForOldResult(Instruction instr) { none() }
+predicate canReuseSsaForOldResult(Instruction instr) { none() }
+
+/** DEPRECATED: Alias for canReuseSsaForOldResult */
+deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
 
 /**
  * Represents a set of `MemoryLocation`s that cannot overlap with
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll
index cee8fa1543b..aaa4cc7bd53 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/reachability/DominanceInternal.qll
@@ -1,7 +1,5 @@
 private import ReachableBlock as Reachability
 
-private module ReachabilityGraph = Reachability::Graph;
-
 module Graph {
   import Reachability::Graph
 
diff --git a/csharp/ql/src/experimental/ir/internal/CSharpType.qll b/csharp/ql/src/experimental/ir/internal/CSharpType.qll
index 02dee3edff9..d87596ae643 100644
--- a/csharp/ql/src/experimental/ir/internal/CSharpType.qll
+++ b/csharp/ql/src/experimental/ir/internal/CSharpType.qll
@@ -88,15 +88,6 @@ predicate hasAddressType(int byteSize) {
  */
 predicate hasFunctionAddressType(int byteSize) { byteSize = getTypeSize(any(NullType type)) }
 
-private int getBaseClassSize(ValueOrRefType type) {
-  if exists(type.getBaseClass()) then result = getContentSize(type.getBaseClass()) else result = 0
-}
-
-private int getContentSize(ValueOrRefType type) {
-  result =
-    getBaseClassSize(type) + sum(Field field | not field.isStatic() | getTypeSize(field.getType()))
-}
-
 private predicate isOpaqueType(ValueOrRefType type) {
   type instanceof Struct or
   type instanceof NullableType or
diff --git a/csharp/ql/src/experimental/ir/internal/IRGuards.qll b/csharp/ql/src/experimental/ir/internal/IRGuards.qll
index a87788eb9a0..91e2208c6f7 100644
--- a/csharp/ql/src/experimental/ir/internal/IRGuards.qll
+++ b/csharp/ql/src/experimental/ir/internal/IRGuards.qll
@@ -28,8 +28,8 @@ class GuardCondition extends Expr {
     or
     // the IR short-circuits if(!x)
     // don't produce a guard condition for `y = !x` and other non-short-circuited cases
-    not exists(Instruction inst | this = inst.getAST()) and
-    exists(IRGuardCondition ir | this.(LogicalNotExpr).getOperand() = ir.getAST())
+    not exists(Instruction inst | this = inst.getAst()) and
+    exists(IRGuardCondition ir | this.(LogicalNotExpr).getOperand() = ir.getAst())
   }
 
   /**
@@ -172,8 +172,8 @@ private class GuardConditionFromBinaryLogicalOperator extends GuardCondition {
  */
 private class GuardConditionFromShortCircuitNot extends GuardCondition, LogicalNotExpr {
   GuardConditionFromShortCircuitNot() {
-    not exists(Instruction inst | this = inst.getAST()) and
-    exists(IRGuardCondition ir | this.getOperand() = ir.getAST())
+    not exists(Instruction inst | this = inst.getAst()) and
+    exists(IRGuardCondition ir | this.getOperand() = ir.getAst())
   }
 
   override predicate controls(BasicBlock controlled, boolean testIsTrue) {
@@ -267,7 +267,7 @@ private class GuardConditionFromIR extends GuardCondition {
   private predicate controlsBlock1(BasicBlock controlled, boolean testIsTrue) {
     exists(IRBlock irb |
       forex(IRGuardCondition inst | inst = ir | inst.controls(irb, testIsTrue)) and
-      irb.getAnInstruction().getAST().(ControlFlowElement).getAControlFlowNode().getBasicBlock() =
+      irb.getAnInstruction().getAst().(ControlFlowElement).getAControlFlowNode().getBasicBlock() =
         controlled and
       not isUnreachedBlock(irb)
     )
diff --git a/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll b/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll
index ccc6b9ea30e..ebdca09414f 100644
--- a/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll
+++ b/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll
@@ -623,7 +623,7 @@ private predicate boundedInstruction(
   )
   or
   exists(PropertyAccess pa |
-    i.(CallInstruction).getAST() = pa and
+    i.(CallInstruction).getAst() = pa and
     pa.getProperty().getName() = "Length" and
     b instanceof ZeroBound and
     delta = origdelta and
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 4938eea6697..a15e7a8f71d 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: 
   - csharp
   - queries
diff --git a/csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql b/csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql
new file mode 100644
index 00000000000..9cc931af0fa
--- /dev/null
+++ b/csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -0,0 +1,91 @@
+/**
+ * @name Capture summary models.
+ * @description Finds applicable summary models to be used by other queries.
+ * @id csharp/utils/model-generator/summary-models
+ */
+
+private import CaptureSummaryModels
+
+/**
+ * Capture fluent APIs that return `this`.
+ * Example of a fluent API:
+ * ```csharp
+ * public class BasicFlow {
+ *   public BasicFlow ReturnThis(object input)
+ *   {
+ *     // some side effect
+ *     return this;
+ *   }
+ * ```
+ * Captured Model:
+ * ```Summaries;BasicFlow;false;ReturnThis;(System.Object);Argument[Qualifier];ReturnValue;value```
+ * Capture APIs that transfer taint from an input parameter to an output return
+ * value or parameter.
+ * Allows a sequence of read steps followed by a sequence of store steps.
+ *
+ * Examples:
+ *
+ * ```csharp
+ * public class BasicFlow {
+ *   private string tainted;
+ *
+ *   public String ReturnField()
+ *   {
+ *     return tainted;
+ *   }
+ *
+ *   public void AssignFieldToArray(object[] target)
+ *   {
+ *     target[0] = tainted;
+ *   }
+ * }
+ * ```
+ * Captured Models:
+ * ```
+ * Summaries;BasicFlow;false;ReturnField;();Argument[Qualifier];ReturnValue;taint |
+ * Summaries;BasicFlow;false;AssignFieldToArray;(System.Object[]);Argument[Qualifier];Argument[0].Element;taint
+ * ```
+ *
+ * ```csharp
+ * public class BasicFlow {
+ *   private string tainted;
+ *
+ *   public void SetField(string s)
+ *   {
+ *     tainted = s;
+ *   }
+ * }
+ * ```
+ * Captured Model:
+ * ```Summaries;BasicFlow;false;SetField;(System.String);Argument[0];Argument[Qualifier];taint```
+ *
+ * ```csharp
+ * public class BasicFlow {
+ *   public void ReturnSubstring(string s)
+ *   {
+ *     return s.Substring(0, 1);
+ *   }
+ * }
+ * ```
+ * Captured Model:
+ * ```Summaries;BasicFlow;false;ReturnSubstring;(System.String);Argument[0];ReturnValue;taint```
+ *
+ * ```csharp
+ * public class BasicFlow {
+ *    public void AssignToArray(int data, int[] target)
+ *    {
+ *        target[0] = data;
+ *    }
+ * }
+ * ```
+ * Captured Model:
+ * ```Summaries;BasicFlow;false;AssignToArray;(System.Int32,System.Int32[]);Argument[0];Argument[1].Element;taint```
+ */
+private string captureFlow(TargetApi api) {
+  result = captureQualifierFlow(api) or
+  result = captureThroughFlow(api)
+}
+
+from TargetApi api, string flow
+where flow = captureFlow(api)
+select flow order by flow
diff --git a/csharp/ql/src/utils/model-generator/CaptureSummaryModels.qll b/csharp/ql/src/utils/model-generator/CaptureSummaryModels.qll
new file mode 100644
index 00000000000..1c7df39d97f
--- /dev/null
+++ b/csharp/ql/src/utils/model-generator/CaptureSummaryModels.qll
@@ -0,0 +1,98 @@
+/**
+ * Provides classes and predicates related to capturing summary models
+ * of the Standard or a 3rd party library.
+ */
+
+import CaptureSummaryModelsSpecific
+
+/**
+ * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
+ */
+string captureQualifierFlow(TargetApi api) {
+  exists(ReturnNodeExt ret |
+    api = returnNodeEnclosingCallable(ret) and
+    isOwnInstanceAccessNode(ret)
+  ) and
+  result = asValueModel(api, qualifierString(), "ReturnValue")
+}
+
+/**
+ * A FlowState representing a tainted read.
+ */
+private class TaintRead extends DataFlow::FlowState {
+  TaintRead() { this = "TaintRead" }
+}
+
+/**
+ * A FlowState representing a tainted write.
+ */
+private class TaintStore extends DataFlow::FlowState {
+  TaintStore() { this = "TaintStore" }
+}
+
+/**
+ * A TaintTracking Configuration used for tracking flow through APIs.
+ * The sources are the parameters of an API and the sinks are the return values (excluding `this`) and parameters.
+ *
+ * This can be used to generate Flow summaries for APIs from parameter to return.
+ */
+class ThroughFlowConfig extends TaintTracking::Configuration {
+  ThroughFlowConfig() { this = "ThroughFlowConfig" }
+
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
+    source instanceof DataFlow::ParameterNode and
+    source.getEnclosingCallable() instanceof TargetApi and
+    state instanceof TaintRead
+  }
+
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
+    sink instanceof ReturnNodeExt and
+    not isOwnInstanceAccessNode(sink) and
+    not exists(captureQualifierFlow(sink.asExpr().getEnclosingCallable())) and
+    (state instanceof TaintRead or state instanceof TaintStore)
+  }
+
+  override predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    exists(TypedContent tc |
+      store(node1, tc, node2, _) and
+      isRelevantContent(tc.getContent()) and
+      (state1 instanceof TaintRead or state1 instanceof TaintStore) and
+      state2 instanceof TaintStore
+    )
+    or
+    exists(DataFlow::Content c |
+      readStep(node1, c, node2) and
+      isRelevantContent(c) and
+      state1 instanceof TaintRead and
+      state2 instanceof TaintRead
+    )
+  }
+
+  override predicate isSanitizer(DataFlow::Node n) {
+    exists(Type t | t = n.getType() and not isRelevantType(t))
+  }
+
+  override DataFlow::FlowFeature getAFeature() {
+    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
+  }
+}
+
+/**
+ * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
+ */
+string captureThroughFlow(TargetApi api) {
+  exists(
+    ThroughFlowConfig config, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input,
+    string output
+  |
+    config.hasFlow(p, returnNodeExt) and
+    returnNodeExt.getEnclosingCallable() = api and
+    input = parameterNodeAsInput(p) and
+    output = returnNodeAsOutput(returnNodeExt) and
+    input != output and
+    result = asTaintModel(api, input, output)
+  )
+}
diff --git a/csharp/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll b/csharp/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll
new file mode 100644
index 00000000000..305dd775727
--- /dev/null
+++ b/csharp/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll
@@ -0,0 +1,15 @@
+/**
+ * Provides predicates related to capturing summary models of the Standard or a 3rd party library.
+ */
+
+import csharp
+import semmle.code.csharp.dataflow.TaintTracking
+import semmle.code.csharp.dataflow.internal.DataFlowImplCommon
+import semmle.code.csharp.dataflow.internal.DataFlowPrivate
+import ModelGeneratorUtils
+
+Callable returnNodeEnclosingCallable(ReturnNodeExt ret) { result = getNodeEnclosingCallable(ret) }
+
+predicate isOwnInstanceAccessNode(ReturnNode node) { node.asExpr() instanceof ThisAccess }
+
+string qualifierString() { result = "Argument[Qualifier]" }
diff --git a/csharp/ql/src/utils/model-generator/ModelGeneratorUtils.qll b/csharp/ql/src/utils/model-generator/ModelGeneratorUtils.qll
new file mode 100644
index 00000000000..05e3d6cbf38
--- /dev/null
+++ b/csharp/ql/src/utils/model-generator/ModelGeneratorUtils.qll
@@ -0,0 +1,71 @@
+import ModelGeneratorUtilsSpecific
+
+/**
+ * Holds if data can flow from `node1` to `node2` either via a read or a write of an intermediate field `f`.
+ */
+predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
+  exists(DataFlow::Content f |
+    readStep(node1, f, node2) and
+    if f instanceof DataFlow::FieldContent
+    then isRelevantType(f.(DataFlow::FieldContent).getField().getType())
+    else
+      if f instanceof DataFlow::SyntheticFieldContent
+      then isRelevantType(f.(DataFlow::SyntheticFieldContent).getField().getType())
+      else any()
+  )
+  or
+  exists(DataFlow::Content f | storeStep(node1, f, node2) | containerContent(f))
+}
+
+/**
+ * Holds if content `c` is either a field or synthetic field of a relevant type
+ * or a container like content.
+ */
+predicate isRelevantContent(DataFlow::Content c) {
+  isRelevantType(c.(DataFlow::FieldContent).getField().getType()) or
+  isRelevantType(c.(DataFlow::SyntheticFieldContent).getField().getType()) or
+  containerContent(c)
+}
+
+/**
+ * Gets the summary model for `api` with `input`, `output` and `kind`.
+ */
+bindingset[input, output, kind]
+string asSummaryModel(TargetApi api, string input, string output, string kind) {
+  result =
+    asPartialModel(api) + input + ";" //
+      + output + ";" //
+      + kind
+}
+
+/**
+ * Gets the value summary model for `api` with `input` and `output`.
+ */
+bindingset[input, output]
+string asValueModel(TargetApi api, string input, string output) {
+  result = asSummaryModel(api, input, output, "value")
+}
+
+/**
+ * Gets the taint summary model for `api` with `input` and `output`.
+ */
+bindingset[input, output]
+string asTaintModel(TargetApi api, string input, string output) {
+  result = asSummaryModel(api, input, output, "taint")
+}
+
+/**
+ * Gets the sink model for `api` with `input` and `kind`.
+ */
+bindingset[input, kind]
+string asSinkModel(TargetApi api, string input, string kind) {
+  result = asPartialModel(api) + input + ";" + kind
+}
+
+/**
+ * Gets the source model for `api` with `output` and `kind`.
+ */
+bindingset[output, kind]
+string asSourceModel(TargetApi api, string output, string kind) {
+  result = asPartialModel(api) + output + ";" + kind
+}
diff --git a/csharp/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll b/csharp/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll
new file mode 100644
index 00000000000..2df238e4ce6
--- /dev/null
+++ b/csharp/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll
@@ -0,0 +1,102 @@
+import csharp
+import semmle.code.csharp.dataflow.internal.DataFlowPrivate
+private import semmle.code.csharp.commons.Util
+private import semmle.code.csharp.dataflow.internal.DataFlowImplCommon
+private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
+
+private predicate isRelevantForModels(Callable api) { not api instanceof MainMethod }
+
+/**
+ * A class of Callables that are relevant for generating summary, source and sinks models for.
+ *
+ * In the Standard library and 3rd party libraries it the Callables that can be called
+ * from outside the library itself.
+ */
+class TargetApi extends Callable {
+  TargetApi() {
+    [this.(Modifiable), this.(Accessor).getDeclaration()].isEffectivelyPublic() and
+    this.fromSource() and
+    isRelevantForModels(this)
+  }
+}
+
+private string parameterQualifiedTypeNamesToString(TargetApi api) {
+  result =
+    concat(Parameter p, int i |
+      p = api.getParameter(i)
+    |
+      p.getType().getQualifiedName(), "," order by i
+    )
+}
+
+/** Holds if the summary should apply for all overrides of this. */
+private predicate isBaseCallableOrPrototype(TargetApi api) {
+  api.getDeclaringType() instanceof Interface
+  or
+  exists(Modifiable m | m = [api.(Modifiable), api.(Accessor).getDeclaration()] |
+    m.isAbstract()
+    or
+    api.getDeclaringType().(Modifiable).isAbstract() and m.(Virtualizable).isVirtual()
+  )
+}
+
+/** Gets a string representing whether the summary should apply for all overrides of this. */
+private string getCallableOverride(TargetApi api) {
+  if isBaseCallableOrPrototype(api) then result = "true" else result = "false"
+}
+
+/** Computes the first 6 columns for CSV rows. */
+string asPartialModel(TargetApi api) {
+  exists(string namespace, string type |
+    api.getDeclaringType().hasQualifiedName(namespace, type) and
+    result =
+      namespace + ";" //
+        + type + ";" //
+        + getCallableOverride(api) + ";" //
+        + api.getName() + ";" //
+        + "(" + parameterQualifiedTypeNamesToString(api) + ")" //
+        + /* ext + */ ";" //
+  )
+}
+
+/**
+ * Holds for type `t` for fields that are relevant as an intermediate
+ * read or write step in the data flow analysis.
+ */
+predicate isRelevantType(Type t) { not t instanceof Enum }
+
+private predicate isPrimitiveTypeUsedForBulkData(Type t) {
+  t.getName().regexpMatch("byte|char|Byte|Char")
+}
+
+private string parameterAccess(Parameter p) {
+  if
+    p.getType() instanceof ArrayType and
+    not isPrimitiveTypeUsedForBulkData(p.getType().(ArrayType).getElementType())
+  then result = "Argument[" + p.getPosition() + "].Element"
+  else result = "Argument[" + p.getPosition() + "]"
+}
+
+/**
+ * Gets the model string representation of the parameter node `p`.
+ */
+string parameterNodeAsInput(DataFlow::ParameterNode p) {
+  result = parameterAccess(p.asParameter())
+  or
+  result = "Argument[Qualifier]" and p instanceof InstanceParameterNode
+}
+
+/**
+ * Gets the model string represention of the the return node `node`.
+ */
+string returnNodeAsOutput(ReturnNodeExt node) {
+  if node.getKind() instanceof ValueReturnKind
+  then result = "ReturnValue"
+  else
+    exists(ParameterPosition pos | pos = node.getKind().(ParamUpdateReturnKind).getPosition() |
+      result = parameterAccess(node.getEnclosingCallable().getParameter(pos.getPosition()))
+      or
+      pos.isThisParameter() and
+      result = "Argument[Qualifier]"
+    )
+}
diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll b/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
index 7d605a491ee..a4d264b2703 100644
--- a/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -124,7 +124,9 @@ abstract class InlineExpectationsTest extends string {
   abstract predicate hasActualResult(Location location, string element, string tag, string value);
 
   /**
-   * Like `hasActualResult`, but returns results that do not require a matching annotation.
+   * Holds if there is an optional result on the specified location.
+   *
+   * This is similar to `hasActualResult`, but returns results that do not require a matching annotation.
    * A failure will still arise if there is an annotation that does not match any results, but not vice versa.
    * Override this predicate to specify optional results.
    */
diff --git a/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql b/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql
index 7518386e6d2..38386d47568 100644
--- a/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql
+++ b/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql
@@ -10,17 +10,17 @@ predicate boundedArrayAccess(ElementAccess aa, int k) {
   exists(Instruction index, Instruction usage, Bound b, int delta |
     (
       // indexer access
-      usage.(CallInstruction).getAST() = aa
+      usage.(CallInstruction).getAst() = aa
       or
       // array access
-      usage.(PointerAddInstruction).getAST() = aa
+      usage.(PointerAddInstruction).getAst() = aa
     ) and
     usage.getAnOperand().getDef() = index and
     boundedInstruction(index, b, delta, true, _)
   |
     exists(PropertyAccess pa |
       k = delta and
-      b.getInstruction().getAST() = pa and
+      b.getInstruction().getAst() = pa and
       pa.getProperty().getName() = "Length" and
       pa.(QualifiableExpr).getQualifier().(VariableAccess).getTarget() =
         aa.getQualifier().(VariableAccess).getTarget()
diff --git a/csharp/ql/test/library-tests/comments/Comments.ql b/csharp/ql/test/library-tests/comments/Comments.ql
index 5ef8d3d75b9..84957e2252f 100644
--- a/csharp/ql/test/library-tests/comments/Comments.ql
+++ b/csharp/ql/test/library-tests/comments/Comments.ql
@@ -21,6 +21,8 @@ query predicate multilineComment(
   commentLine(c, l, numLines, text, rawText)
 }
 
-query predicate xmlComment(CommentBlock c, XmlComment l, int numLines, string text, string rawText) {
+query predicate xmlComment(
+  CommentBlock c, XmlCommentLine l, int numLines, string text, string rawText
+) {
   commentLine(c, l, numLines, text, rawText)
 }
diff --git a/csharp/ql/test/library-tests/structuralcomparison/StructuralComparison.cs b/csharp/ql/test/library-tests/structuralcomparison/StructuralComparison.cs
new file mode 100644
index 00000000000..c27746a7765
--- /dev/null
+++ b/csharp/ql/test/library-tests/structuralcomparison/StructuralComparison.cs
@@ -0,0 +1,54 @@
+using System;
+
+public class Class
+{
+    private readonly int x = 0;
+    private readonly int y = 1;
+
+    public int M0() => 0;
+    public int M1(int a) => a;
+    public int M2(int v1, int v2) => v1 + v2;
+
+
+    public void M3()
+    {
+        var z1 = x + y;
+        var z2 = x + y;
+    }
+
+    public void M4()
+    {
+        var z3 = M1(x);
+        var z4 = M1(x);
+        var z5 = M1(y);
+        var z6 = M0();
+        var z7 = M2(x, y) + M2(x, y);
+        M2(x, y);
+        M2(y, x);
+        M2(y, x);
+    }
+}
+
+public class BaseClass
+{
+    public int Field;
+    public object Prop { get; set; }
+}
+
+public class DerivedClass : BaseClass
+{
+    public void M4()
+    {
+        var x1 = base.Field;
+        var x2 = Field;
+        var x3 = this.Field;
+    }
+
+    public void M5()
+    {
+        var y1 = base.Prop;
+        var y2 = Prop;
+        var y3 = this.Prop;
+    }
+}
+
diff --git a/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected b/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected
new file mode 100644
index 00000000000..cdabf17445b
--- /dev/null
+++ b/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected
@@ -0,0 +1,179 @@
+same
+| StructuralComparison.cs:15:18:15:18 | access to field x | StructuralComparison.cs:16:18:16:18 | access to field x |
+| StructuralComparison.cs:15:18:15:22 | ... + ... | StructuralComparison.cs:16:18:16:22 | ... + ... |
+| StructuralComparison.cs:15:22:15:22 | access to field y | StructuralComparison.cs:16:22:16:22 | access to field y |
+| StructuralComparison.cs:21:18:21:22 | call to method M1 | StructuralComparison.cs:22:18:22:22 | call to method M1 |
+| StructuralComparison.cs:21:21:21:21 | access to field x | StructuralComparison.cs:22:21:22:21 | access to field x |
+| StructuralComparison.cs:21:21:21:21 | access to field x | StructuralComparison.cs:25:21:25:21 | access to field x |
+| StructuralComparison.cs:21:21:21:21 | access to field x | StructuralComparison.cs:25:32:25:32 | access to field x |
+| StructuralComparison.cs:21:21:21:21 | access to field x | StructuralComparison.cs:26:12:26:12 | access to field x |
+| StructuralComparison.cs:21:21:21:21 | access to field x | StructuralComparison.cs:27:15:27:15 | access to field x |
+| StructuralComparison.cs:21:21:21:21 | access to field x | StructuralComparison.cs:28:15:28:15 | access to field x |
+| StructuralComparison.cs:22:21:22:21 | access to field x | StructuralComparison.cs:25:21:25:21 | access to field x |
+| StructuralComparison.cs:22:21:22:21 | access to field x | StructuralComparison.cs:25:32:25:32 | access to field x |
+| StructuralComparison.cs:22:21:22:21 | access to field x | StructuralComparison.cs:26:12:26:12 | access to field x |
+| StructuralComparison.cs:22:21:22:21 | access to field x | StructuralComparison.cs:27:15:27:15 | access to field x |
+| StructuralComparison.cs:22:21:22:21 | access to field x | StructuralComparison.cs:28:15:28:15 | access to field x |
+| StructuralComparison.cs:23:21:23:21 | access to field y | StructuralComparison.cs:25:24:25:24 | access to field y |
+| StructuralComparison.cs:23:21:23:21 | access to field y | StructuralComparison.cs:25:35:25:35 | access to field y |
+| StructuralComparison.cs:23:21:23:21 | access to field y | StructuralComparison.cs:26:15:26:15 | access to field y |
+| StructuralComparison.cs:23:21:23:21 | access to field y | StructuralComparison.cs:27:12:27:12 | access to field y |
+| StructuralComparison.cs:23:21:23:21 | access to field y | StructuralComparison.cs:28:12:28:12 | access to field y |
+| StructuralComparison.cs:25:18:25:25 | call to method M2 | StructuralComparison.cs:25:29:25:36 | call to method M2 |
+| StructuralComparison.cs:25:18:25:25 | call to method M2 | StructuralComparison.cs:26:9:26:16 | call to method M2 |
+| StructuralComparison.cs:25:21:25:21 | access to field x | StructuralComparison.cs:25:32:25:32 | access to field x |
+| StructuralComparison.cs:25:21:25:21 | access to field x | StructuralComparison.cs:26:12:26:12 | access to field x |
+| StructuralComparison.cs:25:21:25:21 | access to field x | StructuralComparison.cs:27:15:27:15 | access to field x |
+| StructuralComparison.cs:25:21:25:21 | access to field x | StructuralComparison.cs:28:15:28:15 | access to field x |
+| StructuralComparison.cs:25:24:25:24 | access to field y | StructuralComparison.cs:25:35:25:35 | access to field y |
+| StructuralComparison.cs:25:24:25:24 | access to field y | StructuralComparison.cs:26:15:26:15 | access to field y |
+| StructuralComparison.cs:25:24:25:24 | access to field y | StructuralComparison.cs:27:12:27:12 | access to field y |
+| StructuralComparison.cs:25:24:25:24 | access to field y | StructuralComparison.cs:28:12:28:12 | access to field y |
+| StructuralComparison.cs:25:29:25:36 | call to method M2 | StructuralComparison.cs:26:9:26:16 | call to method M2 |
+| StructuralComparison.cs:25:32:25:32 | access to field x | StructuralComparison.cs:26:12:26:12 | access to field x |
+| StructuralComparison.cs:25:32:25:32 | access to field x | StructuralComparison.cs:27:15:27:15 | access to field x |
+| StructuralComparison.cs:25:32:25:32 | access to field x | StructuralComparison.cs:28:15:28:15 | access to field x |
+| StructuralComparison.cs:25:35:25:35 | access to field y | StructuralComparison.cs:26:15:26:15 | access to field y |
+| StructuralComparison.cs:25:35:25:35 | access to field y | StructuralComparison.cs:27:12:27:12 | access to field y |
+| StructuralComparison.cs:25:35:25:35 | access to field y | StructuralComparison.cs:28:12:28:12 | access to field y |
+| StructuralComparison.cs:26:12:26:12 | access to field x | StructuralComparison.cs:27:15:27:15 | access to field x |
+| StructuralComparison.cs:26:12:26:12 | access to field x | StructuralComparison.cs:28:15:28:15 | access to field x |
+| StructuralComparison.cs:26:15:26:15 | access to field y | StructuralComparison.cs:27:12:27:12 | access to field y |
+| StructuralComparison.cs:26:15:26:15 | access to field y | StructuralComparison.cs:28:12:28:12 | access to field y |
+| StructuralComparison.cs:27:9:27:16 | call to method M2 | StructuralComparison.cs:28:9:28:16 | call to method M2 |
+| StructuralComparison.cs:27:9:27:17 | ...; | StructuralComparison.cs:28:9:28:17 | ...; |
+| StructuralComparison.cs:27:12:27:12 | access to field y | StructuralComparison.cs:28:12:28:12 | access to field y |
+| StructuralComparison.cs:27:15:27:15 | access to field x | StructuralComparison.cs:28:15:28:15 | access to field x |
+| StructuralComparison.cs:42:18:42:27 | access to field Field | StructuralComparison.cs:43:18:43:22 | access to field Field |
+| StructuralComparison.cs:42:18:42:27 | access to field Field | StructuralComparison.cs:44:18:44:27 | access to field Field |
+| StructuralComparison.cs:43:18:43:22 | access to field Field | StructuralComparison.cs:44:18:44:27 | access to field Field |
+| StructuralComparison.cs:49:18:49:26 | access to property Prop | StructuralComparison.cs:50:18:50:21 | access to property Prop |
+| StructuralComparison.cs:49:18:49:26 | access to property Prop | StructuralComparison.cs:51:18:51:26 | access to property Prop |
+| StructuralComparison.cs:50:18:50:21 | access to property Prop | StructuralComparison.cs:51:18:51:26 | access to property Prop |
+gvn
+| StructuralComparison.cs:5:26:5:26 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:5:26:5:26 | this access | (kind:Expr(12)) |
+| StructuralComparison.cs:5:26:5:30 | ... = ... | ((kind:Expr(16),true,x) :: (0 :: (kind:Expr(63)))) |
+| StructuralComparison.cs:5:30:5:30 | 0 | 0 |
+| StructuralComparison.cs:6:26:6:26 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:6:26:6:26 | this access | (kind:Expr(12)) |
+| StructuralComparison.cs:6:26:6:30 | ... = ... | ((kind:Expr(16),true,y) :: (1 :: (kind:Expr(63)))) |
+| StructuralComparison.cs:6:30:6:30 | 1 | 1 |
+| StructuralComparison.cs:8:24:8:24 | 0 | 0 |
+| StructuralComparison.cs:9:29:9:29 | access to parameter a | (kind:Expr(15),false,a) |
+| StructuralComparison.cs:10:38:10:39 | access to parameter v1 | (kind:Expr(15),false,v1) |
+| StructuralComparison.cs:10:38:10:44 | ... + ... | ((kind:Expr(15),false,v2) :: ((kind:Expr(15),false,v1) :: (kind:Expr(44)))) |
+| StructuralComparison.cs:10:43:10:44 | access to parameter v2 | (kind:Expr(15),false,v2) |
+| StructuralComparison.cs:14:5:17:5 | {...} | ((((kind:Expr(14),false,z2) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z1) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1)))) |
+| StructuralComparison.cs:15:9:15:23 | ... ...; | (((kind:Expr(14),false,z1) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:15:13:15:14 | access to local variable z1 | (kind:Expr(14),false,z1) |
+| StructuralComparison.cs:15:13:15:22 | Int32 z1 = ... | ((kind:Expr(14),false,z1) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:15:18:15:18 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:15:18:15:18 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:15:18:15:22 | ... + ... | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) |
+| StructuralComparison.cs:15:22:15:22 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:15:22:15:22 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:16:9:16:23 | ... ...; | (((kind:Expr(14),false,z2) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:16:13:16:14 | access to local variable z2 | (kind:Expr(14),false,z2) |
+| StructuralComparison.cs:16:13:16:22 | Int32 z2 = ... | ((kind:Expr(14),false,z2) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:16:18:16:18 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:16:18:16:18 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:16:18:16:22 | ... + ... | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) |
+| StructuralComparison.cs:16:22:16:22 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:16:22:16:22 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:20:5:29:5 | {...} | ((((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(14),false,z7) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z6) :: (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z5) :: (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z4) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z3) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1)))))))))) |
+| StructuralComparison.cs:21:9:21:23 | ... ...; | (((kind:Expr(14),false,z3) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:21:13:21:14 | access to local variable z3 | (kind:Expr(14),false,z3) |
+| StructuralComparison.cs:21:13:21:22 | Int32 z3 = ... | ((kind:Expr(14),false,z3) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:21:18:21:22 | call to method M1 | ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) |
+| StructuralComparison.cs:21:18:21:22 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:21:21:21:21 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:21:21:21:21 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:22:9:22:23 | ... ...; | (((kind:Expr(14),false,z4) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:22:13:22:14 | access to local variable z4 | (kind:Expr(14),false,z4) |
+| StructuralComparison.cs:22:13:22:22 | Int32 z4 = ... | ((kind:Expr(14),false,z4) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:22:18:22:22 | call to method M1 | ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) |
+| StructuralComparison.cs:22:18:22:22 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:22:21:22:21 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:22:21:22:21 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:23:9:23:23 | ... ...; | (((kind:Expr(14),false,z5) :: (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:23:13:23:14 | access to local variable z5 | (kind:Expr(14),false,z5) |
+| StructuralComparison.cs:23:13:23:22 | Int32 z5 = ... | ((kind:Expr(14),false,z5) :: (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:23:18:23:22 | call to method M1 | ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) |
+| StructuralComparison.cs:23:18:23:22 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:23:21:23:21 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:23:21:23:21 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:24:9:24:22 | ... ...; | (((kind:Expr(14),false,z6) :: (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:24:13:24:14 | access to local variable z6 | (kind:Expr(14),false,z6) |
+| StructuralComparison.cs:24:13:24:21 | Int32 z6 = ... | ((kind:Expr(14),false,z6) :: (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:24:18:24:21 | call to method M0 | ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) |
+| StructuralComparison.cs:24:18:24:21 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:25:9:25:37 | ... ...; | (((kind:Expr(14),false,z7) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:25:13:25:14 | access to local variable z7 | (kind:Expr(14),false,z7) |
+| StructuralComparison.cs:25:13:25:36 | Int32 z7 = ... | ((kind:Expr(14),false,z7) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:25:18:25:25 | call to method M2 | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) |
+| StructuralComparison.cs:25:18:25:25 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:25:18:25:36 | ... + ... | (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) |
+| StructuralComparison.cs:25:21:25:21 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:25:21:25:21 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:25:24:25:24 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:25:24:25:24 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:25:29:25:36 | call to method M2 | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) |
+| StructuralComparison.cs:25:29:25:36 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:25:32:25:32 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:25:32:25:32 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:25:35:25:35 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:25:35:25:35 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:26:9:26:16 | call to method M2 | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) |
+| StructuralComparison.cs:26:9:26:16 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:26:9:26:17 | ...; | (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) |
+| StructuralComparison.cs:26:12:26:12 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:26:12:26:12 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:26:15:26:15 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:26:15:26:15 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:27:9:27:16 | call to method M2 | ((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) |
+| StructuralComparison.cs:27:9:27:16 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:27:9:27:17 | ...; | (((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) |
+| StructuralComparison.cs:27:12:27:12 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:27:12:27:12 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:27:15:27:15 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:27:15:27:15 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:28:9:28:16 | call to method M2 | ((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) |
+| StructuralComparison.cs:28:9:28:16 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:28:9:28:17 | ...; | (((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) |
+| StructuralComparison.cs:28:12:28:12 | access to field y | (kind:Expr(16),true,y) |
+| StructuralComparison.cs:28:12:28:12 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:28:15:28:15 | access to field x | (kind:Expr(16),true,x) |
+| StructuralComparison.cs:28:15:28:15 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:41:5:45:5 | {...} | ((((kind:Expr(14),false,x3) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,x2) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,x1) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1))))) |
+| StructuralComparison.cs:42:9:42:28 | ... ...; | (((kind:Expr(14),false,x1) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:42:13:42:14 | access to local variable x1 | (kind:Expr(14),false,x1) |
+| StructuralComparison.cs:42:13:42:27 | Int32 x1 = ... | ((kind:Expr(14),false,x1) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:42:18:42:21 | base access | (kind:Expr(13),false,BaseClass) |
+| StructuralComparison.cs:42:18:42:27 | access to field Field | (kind:Expr(16),true,Field) |
+| StructuralComparison.cs:43:9:43:23 | ... ...; | (((kind:Expr(14),false,x2) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:43:13:43:14 | access to local variable x2 | (kind:Expr(14),false,x2) |
+| StructuralComparison.cs:43:13:43:22 | Int32 x2 = ... | ((kind:Expr(14),false,x2) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:43:18:43:22 | access to field Field | (kind:Expr(16),true,Field) |
+| StructuralComparison.cs:43:18:43:22 | this access | (kind:Expr(12),false,DerivedClass) |
+| StructuralComparison.cs:44:9:44:28 | ... ...; | (((kind:Expr(14),false,x3) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:44:13:44:14 | access to local variable x3 | (kind:Expr(14),false,x3) |
+| StructuralComparison.cs:44:13:44:27 | Int32 x3 = ... | ((kind:Expr(14),false,x3) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:44:18:44:21 | this access | (kind:Expr(12),false,DerivedClass) |
+| StructuralComparison.cs:44:18:44:27 | access to field Field | (kind:Expr(16),true,Field) |
+| StructuralComparison.cs:48:5:52:5 | {...} | ((((kind:Expr(14),false,y3) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,y2) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,y1) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1))))) |
+| StructuralComparison.cs:49:9:49:27 | ... ...; | (((kind:Expr(14),false,y1) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:49:13:49:14 | access to local variable y1 | (kind:Expr(14),false,y1) |
+| StructuralComparison.cs:49:13:49:26 | Object y1 = ... | ((kind:Expr(14),false,y1) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:49:18:49:21 | base access | (kind:Expr(13),false,BaseClass) |
+| StructuralComparison.cs:49:18:49:26 | access to property Prop | (kind:Expr(17),true,Prop) |
+| StructuralComparison.cs:50:9:50:22 | ... ...; | (((kind:Expr(14),false,y2) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:50:13:50:14 | access to local variable y2 | (kind:Expr(14),false,y2) |
+| StructuralComparison.cs:50:13:50:21 | Object y2 = ... | ((kind:Expr(14),false,y2) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:50:18:50:21 | access to property Prop | (kind:Expr(17),true,Prop) |
+| StructuralComparison.cs:50:18:50:21 | this access | (kind:Expr(12),false,DerivedClass) |
+| StructuralComparison.cs:51:9:51:27 | ... ...; | (((kind:Expr(14),false,y3) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:51:13:51:14 | access to local variable y3 | (kind:Expr(14),false,y3) |
+| StructuralComparison.cs:51:13:51:26 | Object y3 = ... | ((kind:Expr(14),false,y3) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:51:18:51:21 | this access | (kind:Expr(12),false,DerivedClass) |
+| StructuralComparison.cs:51:18:51:26 | access to property Prop | (kind:Expr(17),true,Prop) |
diff --git a/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.ql b/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.ql
new file mode 100644
index 00000000000..fa94374a1dc
--- /dev/null
+++ b/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.ql
@@ -0,0 +1,34 @@
+import csharp
+import semmle.code.csharp.commons.StructuralComparison
+
+private class StructuralComparisonTest extends StructuralComparisonConfiguration {
+  StructuralComparisonTest() { this = "StructuralComparisonTest" }
+
+  /**
+   * All pairs of controls flow elements found in the source and within the same
+   * enclosing callable excluding all instances of `ThisAccess` to reduce the size
+   * of the output.
+   */
+  override predicate candidate(ControlFlowElement e1, ControlFlowElement e2) {
+    e1.fromSource() and
+    e2.fromSource() and
+    e1 != e2 and
+    e1.getEnclosingCallable() = e2.getEnclosingCallable() and
+    not e1 instanceof ThisAccess
+  }
+}
+
+query predicate same(ControlFlowElement e1, ControlFlowElement e2) {
+  exists(StructuralComparisonTest sct, Location l1, Location l2 |
+    sct.same(e1, e2) and
+    l1 = e1.getLocation() and
+    l2 = e2.getLocation() and
+    (
+      l1.getStartLine() < l2.getStartLine()
+      or
+      l1.getStartLine() = l2.getStartLine() and l1.getStartColumn() < l2.getStartColumn()
+    )
+  )
+}
+
+query predicate gvn(ControlFlowElement e, Gvn gvn) { gvn = toGvn(e) and e.fromSource() }
diff --git a/csharp/ql/test/shared/FlowSummaries.qll b/csharp/ql/test/shared/FlowSummaries.qll
index 6afa16a744a..f2cdea8a99f 100644
--- a/csharp/ql/test/shared/FlowSummaries.qll
+++ b/csharp/ql/test/shared/FlowSummaries.qll
@@ -27,7 +27,7 @@ abstract class IncludeSummarizedCallable extends RelevantSummarizedCallable {
     )
   }
 
-  /** Gets a string representing, whether the summary should apply for all overrides of this. */
+  /** Gets a string representing whether the summary should apply for all overrides of this. */
   private string getCallableOverride() {
     if this.isBaseCallableOrPrototype() then result = "true" else result = "false"
   }
diff --git a/csharp/ql/test/utils/model-generator/CaptureSummaryModels.expected b/csharp/ql/test/utils/model-generator/CaptureSummaryModels.expected
new file mode 100644
index 00000000000..38c6c527247
--- /dev/null
+++ b/csharp/ql/test/utils/model-generator/CaptureSummaryModels.expected
@@ -0,0 +1,11 @@
+| Summaries;BasicFlow;false;AssignFieldToArray;(System.Object[]);Argument[Qualifier];Argument[0].Element;taint |
+| Summaries;BasicFlow;false;AssignToArray;(System.Int32,System.Int32[]);Argument[0];Argument[1].Element;taint |
+| Summaries;BasicFlow;false;ReturnArrayElement;(System.Int32[]);Argument[0].Element;ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnField;();Argument[Qualifier];ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnParam0;(System.String,System.Object);Argument[0];ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnParam1;(System.String,System.Object);Argument[1];ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);Argument[0];ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);Argument[1];ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnSubstring;(System.String);Argument[0];ReturnValue;taint |
+| Summaries;BasicFlow;false;ReturnThis;(System.Object);Argument[Qualifier];ReturnValue;value |
+| Summaries;BasicFlow;false;SetField;(System.String);Argument[0];Argument[Qualifier];taint |
diff --git a/csharp/ql/test/utils/model-generator/CaptureSummaryModels.qlref b/csharp/ql/test/utils/model-generator/CaptureSummaryModels.qlref
new file mode 100644
index 00000000000..1ebf2afb19b
--- /dev/null
+++ b/csharp/ql/test/utils/model-generator/CaptureSummaryModels.qlref
@@ -0,0 +1 @@
+utils/model-generator/CaptureSummaryModels.ql
\ No newline at end of file
diff --git a/csharp/ql/test/utils/model-generator/Summaries.cs b/csharp/ql/test/utils/model-generator/Summaries.cs
new file mode 100644
index 00000000000..7d47ae694bb
--- /dev/null
+++ b/csharp/ql/test/utils/model-generator/Summaries.cs
@@ -0,0 +1,58 @@
+using System;
+
+namespace Summaries;
+
+public class BasicFlow
+{
+    private string tainted;
+
+    public BasicFlow ReturnThis(object input)
+    {
+        return this;
+    }
+
+    public string ReturnParam0(string input0, object input1)
+    {
+        return input0;
+    }
+
+    public object ReturnParam1(string input0, object input1)
+    {
+        return input1;
+    }
+
+    public object ReturnParamMultiple(object input0, object input1)
+    {
+        return (System.DateTime.Now.DayOfWeek == System.DayOfWeek.Monday) ? input0 : input1;
+    }
+
+    public string ReturnSubstring(string s)
+    {
+        return s.Substring(0, 1);
+    }
+
+    public int ReturnArrayElement(int[] input)
+    {
+        return input[0];
+    }
+
+    public void AssignToArray(int data, int[] target)
+    {
+        target[0] = data;
+    }
+
+    public void SetField(string s)
+    {
+        tainted = s;
+    }
+
+    public string ReturnField()
+    {
+        return tainted;
+    }
+
+    public void AssignFieldToArray(object[] target)
+    {
+        target[0] = tainted;
+    }
+}
diff --git a/docs/codeql/support/reusables/frameworks.rst b/docs/codeql/support/reusables/frameworks.rst
index c214eb926ce..93280c6732a 100644
--- a/docs/codeql/support/reusables/frameworks.rst
+++ b/docs/codeql/support/reusables/frameworks.rst
@@ -173,7 +173,12 @@ Python built-in support
    starlette, Asynchronous Server Gateway Interface (ASGI)
    python-ldap, Lightweight Directory Access Protocol (LDAP)
    ldap3, Lightweight Directory Access Protocol (LDAP)
+   httpx, HTTP client
+   pycurl, HTTP client
    requests, HTTP client
+   urllib, HTTP client
+   urllib2, HTTP client
+   urllib3, HTTP client
    dill, Serialization
    PyYAML, Serialization
    ruamel.yaml, Serialization
@@ -206,5 +211,6 @@ Python built-in support
    pycryptodomex, Cryptography library
    rsa, Cryptography library
    MarkupSafe, Escaping Library
+   libtaxii, TAXII utility library
    libxml2, XML processing library
    lxml, XML processing library
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index 13287d2972c..09e7e73293a 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -1,112 +1,116 @@
-package,sink,source,summary,sink:bean-validation,sink:create-file,sink:groovy,sink:header-splitting,sink:information-leak,sink:intent-start,sink:jexl,sink:jndi-injection,sink:ldap,sink:logging,sink:mvel,sink:ognl-injection,sink:open-url,sink:pending-intent-sent,sink:set-hostname-verifier,sink:sql,sink:url-open-stream,sink:url-redirect,sink:write-file,sink:xpath,sink:xslt,sink:xss,source:android-widget,source:contentprovider,source:remote,summary:taint,summary:value
-android.app,16,,103,,,,,,7,,,,,,,,9,,,,,,,,,,,,18,85
-android.content,24,27,100,,,,,,16,,,,,,,,,,8,,,,,,,,27,,31,69
-android.database,59,,30,,,,,,,,,,,,,,,,59,,,,,,,,,,30,
-android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
-android.os,,,122,,,,,,,,,,,,,,,,,,,,,,,,,,41,81
-android.util,6,16,,,,,,,,,,,6,,,,,,,,,,,,,,,16,,
-android.webkit,3,2,,,,,,,,,,,,,,,,,,,,,,,3,,,2,,
-android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,1,,,1,
-androidx.slice,2,5,88,,,,,,,,,,,,,,2,,,,,,,,,,5,,27,61
-cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.databind,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,6,
-com.google.common.base,,,85,,,,,,,,,,,,,,,,,,,,,,,,,,62,23
-com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,17
-com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
-com.google.common.flogger,29,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,
-com.google.common.io,6,,73,,,,,,,,,,,,,,,,,6,,,,,,,,,72,1
-com.opensymphony.xwork2.ognl,3,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
-com.unboundid.ldap.sdk,17,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,
-flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-groovy.lang,26,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,
-groovy.util,5,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,
-jakarta.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,2,,,7,,
-jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
-jakarta.ws.rs.client,1,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
-jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
-jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,2,,,,,,,,94,55
-java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-java.io,37,,31,,15,,,,,,,,,,,,,,,,,22,,,,,,,31,
-java.lang,8,,58,,,,,,,,,,8,,,,,,,,,,,,,,,,46,12
-java.net,10,3,7,,,,,,,,,,,,,10,,,,,,,,,,,,3,7,
-java.nio,15,,6,,13,,,,,,,,,,,,,,,,,2,,,,,,,6,
-java.sql,7,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,
-java.util,34,,438,,,,,,,,,,34,,,,,,,,,,,,,,,,24,414
-javax.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,2,,,7,,
-javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
-javax.management.remote,2,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
-javax.naming,7,,,,,,,,,,6,1,,,,,,,,,,,,,,,,,,
-javax.net.ssl,2,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
-javax.script,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
-javax.servlet,4,21,2,,,,3,1,,,,,,,,,,,,,,,,,,,,21,2,
-javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,1,,
-javax.ws.rs.client,1,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
-javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
-javax.ws.rs.core,3,,149,,,,1,,,,,,,,,,,,,,2,,,,,,,,94,55
-javax.xml.transform,1,,6,,,,,,,,,,,,,,,,,,,,,1,,,,,6,
-javax.xml.xpath,3,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,
-jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,10
-net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,
-ognl,6,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
-org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,6,
-org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.collections4,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.io,93,2,565,,78,,,,,,,,,,,15,,,,,,,,,,,,2,551,14
-org.apache.commons.jexl2,15,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.jexl3,15,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.lang3,,,424,,,,,,,,,,,,,,,,,,,,,,,,,,293,131
-org.apache.commons.logging,6,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
-org.apache.commons.ognl,6,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
-org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
-org.apache.directory.ldap.client.api,1,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.hc.core5.http,1,2,39,,,,,,,,,,,,,,,,,,,,,,1,,,2,39,
-org.apache.hc.core5.net,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,2,
-org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
-org.apache.http,27,3,70,,,,,,,,,,,,,25,,,,,,,,,2,,,3,62,8
-org.apache.ibatis.jdbc,6,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,
-org.apache.log4j,11,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,
-org.apache.logging.log4j,359,,8,,,,,,,,,,359,,,,,,,,,,,,,,,,4,4
-org.apache.shiro.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.shiro.jndi,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
-org.codehaus.groovy.control,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
-org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,
-org.hibernate,7,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,
-org.jboss.logging,324,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,
-org.jooq,1,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
-org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
-org.mvel2,16,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,
-org.scijava.log,13,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,
-org.slf4j,55,,6,,,,,,,,,,55,,,,,,,,,,,,,,,,2,4
-org.springframework.beans,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,26
-org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,13
-org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-org.springframework.http,14,,70,,,,,,,,,,,,,14,,,,,,,,,,,,,60,10
-org.springframework.jdbc.core,10,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,
-org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,
-org.springframework.jndi,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
-org.springframework.ldap,47,,,,,,,,,,33,14,,,,,,,,,,,,,,,,,,
-org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,,,,,6,,
-org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,,,,,32
-org.springframework.util,,,139,,,,,,,,,,,,,,,,,,,,,,,,,,87,52
-org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,13,
-org.springframework.web.client,13,3,,,,,,,,,,,,,,13,,,,,,,,,,,,3,,
-org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,,,,,8,,
-org.springframework.web.multipart,,12,13,,,,,,,,,,,,,,,,,,,,,,,,,12,13,
-org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,
-org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
-org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
-play.mvc,,4,,,,,,,,,,,,,,,,,,,,,,,,,,4,,
-ratpack.core.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-ratpack.core.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
-ratpack.core.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
-ratpack.exec,,,48,,,,,,,,,,,,,,,,,,,,,,,,,,,48
-ratpack.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-ratpack.func,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,35
-ratpack.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
-ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
-ratpack.util,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,35
+package,sink,source,summary,sink:bean-validation,sink:create-file,sink:groovy,sink:header-splitting,sink:information-leak,sink:intent-start,sink:jdbc-url,sink:jexl,sink:jndi-injection,sink:ldap,sink:logging,sink:mvel,sink:ognl-injection,sink:open-url,sink:pending-intent-sent,sink:set-hostname-verifier,sink:sql,sink:url-open-stream,sink:url-redirect,sink:write-file,sink:xpath,sink:xslt,sink:xss,source:android-widget,source:contentprovider,source:remote,summary:taint,summary:value
+android.app,16,,103,,,,,,7,,,,,,,,,9,,,,,,,,,,,,18,85
+android.content,24,27,100,,,,,,16,,,,,,,,,,,8,,,,,,,,27,,31,69
+android.database,59,,30,,,,,,,,,,,,,,,,,59,,,,,,,,,,30,
+android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
+android.os,,,122,,,,,,,,,,,,,,,,,,,,,,,,,,,41,81
+android.util,6,16,,,,,,,,,,,,6,,,,,,,,,,,,,,,16,,
+android.webkit,3,2,,,,,,,,,,,,,,,,,,,,,,,,3,,,2,,
+android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,,1,,,1,
+androidx.slice,2,5,88,,,,,,,,,,,,,,,2,,,,,,,,,,5,,27,61
+cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.databind,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+com.google.common.base,,,85,,,,,,,,,,,,,,,,,,,,,,,,,,,62,23
+com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,17
+com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
+com.google.common.flogger,29,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,
+com.google.common.io,6,,73,,,,,,,,,,,,,,,,,,6,,,,,,,,,72,1
+com.opensymphony.xwork2.ognl,3,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+com.unboundid.ldap.sdk,17,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,
+com.zaxxer.hikari,2,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,
+flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+groovy.lang,26,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,,
+groovy.util,5,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,
+jakarta.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,,2,,,7,,
+jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+jakarta.ws.rs.client,1,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
+jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
+jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,,2,,,,,,,,94,55
+java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+java.io,37,,31,,15,,,,,,,,,,,,,,,,,,22,,,,,,,31,
+java.lang,8,,58,,,,,,,,,,,8,,,,,,,,,,,,,,,,46,12
+java.net,10,3,7,,,,,,,,,,,,,,10,,,,,,,,,,,,3,7,
+java.nio,15,,6,,13,,,,,,,,,,,,,,,,,,2,,,,,,,6,
+java.sql,11,,,,,,,,,4,,,,,,,,,,7,,,,,,,,,,,
+java.util,34,,438,,,,,,,,,,,34,,,,,,,,,,,,,,,,24,414
+javax.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,,2,,,7,,
+javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+javax.management.remote,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
+javax.naming,7,,,,,,,,,,,6,1,,,,,,,,,,,,,,,,,,
+javax.net.ssl,2,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
+javax.script,1,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+javax.servlet,4,21,2,,,,3,1,,,,,,,,,,,,,,,,,,,,,21,2,
+javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,1,,
+javax.ws.rs.client,1,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
+javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
+javax.ws.rs.core,3,,149,,,,1,,,,,,,,,,,,,,,2,,,,,,,,94,55
+javax.xml.transform,1,,6,,,,,,,,,,,,,,,,,,,,,,1,,,,,6,
+javax.xml.xpath,3,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,
+jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,10
+net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,
+ognl,6,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
+org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.collections4,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.io,93,2,565,,78,,,,,,,,,,,,15,,,,,,,,,,,,2,551,14
+org.apache.commons.jexl2,15,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.jexl3,15,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.lang3,,,424,,,,,,,,,,,,,,,,,,,,,,,,,,,293,131
+org.apache.commons.logging,6,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
+org.apache.commons.ognl,6,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
+org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
+org.apache.directory.ldap.client.api,1,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.hc.core5.http,1,2,39,,,,,,,,,,,,,,,,,,,,,,,1,,,2,39,
+org.apache.hc.core5.net,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,2,
+org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
+org.apache.http,27,3,70,,,,,,,,,,,,,,25,,,,,,,,,2,,,3,62,8
+org.apache.ibatis.jdbc,6,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,
+org.apache.log4j,11,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,
+org.apache.logging.log4j,359,,8,,,,,,,,,,,359,,,,,,,,,,,,,,,,4,4
+org.apache.shiro.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.shiro.jndi,1,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+org.codehaus.groovy.control,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,
+org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,
+org.hibernate,7,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,
+org.jboss.logging,324,,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,
+org.jdbi.v3.core,6,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,
+org.jooq,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
+org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
+org.mvel2,16,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,
+org.scijava.log,13,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,
+org.slf4j,55,,6,,,,,,,,,,,55,,,,,,,,,,,,,,,,2,4
+org.springframework.beans,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,26
+org.springframework.boot.jdbc,1,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
+org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,13
+org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+org.springframework.http,14,,70,,,,,,,,,,,,,,14,,,,,,,,,,,,,60,10
+org.springframework.jdbc.core,10,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,
+org.springframework.jdbc.datasource,4,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,
+org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,
+org.springframework.jndi,1,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+org.springframework.ldap,47,,,,,,,,,,,33,14,,,,,,,,,,,,,,,,,,
+org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,
+org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,,,,,,32
+org.springframework.util,,,139,,,,,,,,,,,,,,,,,,,,,,,,,,,87,52
+org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,13,
+org.springframework.web.client,13,3,,,,,,,,,,,,,,,13,,,,,,,,,,,,3,,
+org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,
+org.springframework.web.multipart,,12,13,,,,,,,,,,,,,,,,,,,,,,,,,,12,13,
+org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,
+org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
+play.mvc,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,
+ratpack.core.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+ratpack.core.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
+ratpack.core.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
+ratpack.exec,,,48,,,,,,,,,,,,,,,,,,,,,,,,,,,,48
+ratpack.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+ratpack.func,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
+ratpack.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
+ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
+ratpack.util,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,,35
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index 84470186ecc..c666f7e5d54 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -15,9 +15,9 @@ Java framework & library support
    `Apache HttpComponents <https://hc.apache.org/>`_,"``org.apache.hc.core5.*``, ``org.apache.http``",5,136,28,,,3,,,,25
    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,35,,6,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,,
-   Java Standard Library,``java.*``,3,541,111,28,,,7,,,10
+   Java Standard Library,``java.*``,3,541,115,28,,,7,,,10
    Java extensions,"``javax.*``, ``jakarta.*``",54,552,32,,,4,,1,1,2
-   `Spring <https://spring.io/>`_,``org.springframework.*``,29,472,96,,,,19,14,,29
-   Others,"``androidx.slice``, ``cn.hutool.core.codec``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.opensymphony.xwork2.ognl``, ``com.unboundid.ldap.sdk``, ``flexjson``, ``groovy.lang``, ``groovy.util``, ``jodd.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.apache.commons.codec``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.logging``, ``org.apache.commons.ognl``, ``org.apache.directory.ldap.client.api``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.logging.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.hibernate``, ``org.jboss.logging``, ``org.jooq``, ``org.mvel2``, ``org.scijava.log``, ``org.slf4j``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``",44,283,921,,,,14,18,,
-   Totals,,183,6225,1424,106,6,10,107,33,1,81
+   `Spring <https://spring.io/>`_,``org.springframework.*``,29,472,101,,,,19,14,,29
+   Others,"``androidx.slice``, ``cn.hutool.core.codec``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.opensymphony.xwork2.ognl``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``groovy.lang``, ``groovy.util``, ``jodd.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.apache.commons.codec``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.logging``, ``org.apache.commons.ognl``, ``org.apache.directory.ldap.client.api``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.logging.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.hibernate``, ``org.jboss.logging``, ``org.jdbi.v3.core``, ``org.jooq``, ``org.mvel2``, ``org.scijava.log``, ``org.slf4j``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``",44,283,929,,,,14,18,,
+   Totals,,183,6225,1441,106,6,10,107,33,1,81
 
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 9d066ac3d17..db971f8c7dd 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 0.0.11
+
+### New Features
+
+* Added `hasDescendant(RefType anc, Type sub)`
+* Added `RefType.getADescendant()`
+* Added `RefType.getAStrictAncestor()`
+
+### Minor Analysis Improvements
+
+ * Add support for `CharacterLiteral` in `CompileTimeConstantExpr.getStringValue()`
+
 ## 0.0.10
 
 ### New Features
diff --git a/java/ql/lib/change-notes/2022-02-07-deleted-deprecations.md b/java/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
new file mode 100644
index 00000000000..e8da1e8e158
--- /dev/null
+++ b/java/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* All deprecated predicates/classes/modules that have been deprecated for over a year have been deleted.
\ No newline at end of file
diff --git a/java/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md b/java/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
new file mode 100644
index 00000000000..a79f286aacd
--- /dev/null
+++ b/java/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/java/ql/lib/change-notes/2022-02-21-type-hierarchy.md b/java/ql/lib/change-notes/2022-02-21-type-hierarchy.md
deleted file mode 100644
index 5911c33d131..00000000000
--- a/java/ql/lib/change-notes/2022-02-21-type-hierarchy.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: feature
----
-* Added `hasDescendant(RefType anc, Type sub)`
-* Added `RefType.getADescendant()`
-* Added `RefType.getAStrictAncestor()`
diff --git a/java/ql/lib/change-notes/2022-03-11-revert-8325.md b/java/ql/lib/change-notes/2022-03-11-revert-8325.md
new file mode 100644
index 00000000000..d38d6327819
--- /dev/null
+++ b/java/ql/lib/change-notes/2022-03-11-revert-8325.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+ * Re-removed support for `CharacterLiteral` from `CompileTimeConstantExpr.getStringValue()` to restore the convention that that predicate only applies to `String`-typed constants.
diff --git a/java/ql/lib/change-notes/2022-03-14-new-jdbc-ssrf-sinks.md b/java/ql/lib/change-notes/2022-03-14-new-jdbc-ssrf-sinks.md
new file mode 100644
index 00000000000..c154b12cfad
--- /dev/null
+++ b/java/ql/lib/change-notes/2022-03-14-new-jdbc-ssrf-sinks.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+ * Added support for detection of SSRF via JDBC database URLs, including connections made using the standard library (`java.sql`), Hikari Connection Pool, JDBI and Spring JDBC.
diff --git a/java/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md b/java/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
new file mode 100644
index 00000000000..3481d507db3
--- /dev/null
+++ b/java/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The flow state variants of `isBarrier` and `isAdditionalFlowStep` are no longer exposed in the taint tracking library. The `isSanitizer` and `isAdditionalTaintStep` predicates should be used instead.
diff --git a/java/ql/lib/change-notes/released/0.0.11.md b/java/ql/lib/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..4ea71b83f53
--- /dev/null
+++ b/java/ql/lib/change-notes/released/0.0.11.md
@@ -0,0 +1,11 @@
+## 0.0.11
+
+### New Features
+
+* Added `hasDescendant(RefType anc, Type sub)`
+* Added `RefType.getADescendant()`
+* Added `RefType.getAStrictAncestor()`
+
+### Minor Analysis Improvements
+
+ * Add support for `CharacterLiteral` in `CompileTimeConstantExpr.getStringValue()`
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 694ff807403..41d541a67fb 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index 5a991d8814c..4f3c458c186 100755
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1666,7 +1666,10 @@ class LValue extends VarAccess {
    * (such as (`+=`), both the RHS and the LHS of the compound assignment
    * are source expressions of the assignment.
    */
-  Expr getRHS() { exists(Assignment e | e.getDest() = this and e.getSource() = result) }
+  Expr getRhs() { exists(Assignment e | e.getDest() = this and e.getSource() = result) }
+
+  /** DEPRECATED: Alias for getRhs */
+  deprecated Expr getRHS() { result = this.getRhs() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
index 31c81f46c0f..c05d478c79a 100755
--- a/java/ql/lib/semmle/code/java/Statement.qll
+++ b/java/ql/lib/semmle/code/java/Statement.qll
@@ -82,12 +82,6 @@ class BlockStmt extends Stmt, @block {
   override string getAPrimaryQlClass() { result = "BlockStmt" }
 }
 
-/**
- * DEPRECATED: This is now called `BlockStmt` to avoid confusion with
- * `BasicBlock`.
- */
-deprecated class Block = BlockStmt;
-
 /** A block with only a single statement. */
 class SingletonBlock extends BlockStmt {
   SingletonBlock() { this.getNumStmt() = 1 }
@@ -103,14 +97,6 @@ class SingletonBlock extends BlockStmt {
 abstract class ConditionalStmt extends Stmt {
   /** Gets the boolean condition of this conditional statement. */
   abstract Expr getCondition();
-
-  /**
-   * Gets the statement that is executed whenever the condition
-   * of this branch statement evaluates to `true`.
-   *
-   * DEPRECATED: use `ConditionNode.getATrueSuccessor()` instead.
-   */
-  abstract deprecated Stmt getTrueSuccessor();
 }
 
 /** An `if` statement. */
@@ -121,12 +107,6 @@ class IfStmt extends ConditionalStmt, @ifstmt {
   /** Gets the `then` branch of this `if` statement. */
   Stmt getThen() { result.isNthChildOf(this, 1) }
 
-  /**
-   * Gets the statement that is executed whenever the condition
-   * of this branch statement evaluates to `true`.
-   */
-  deprecated override Stmt getTrueSuccessor() { result = this.getThen() }
-
   /** Gets the `else` branch of this `if` statement. */
   Stmt getElse() { result.isNthChildOf(this, 2) }
 
@@ -174,12 +154,6 @@ class ForStmt extends ConditionalStmt, @forstmt {
   /** Gets the body of this `for` loop. */
   Stmt getStmt() { result.getParent() = this and result.getIndex() = 2 }
 
-  /**
-   * Gets the statement that is executed whenever the condition
-   * of this branch statement evaluates to true.
-   */
-  deprecated override Stmt getTrueSuccessor() { result = this.getStmt() }
-
   /**
    * Gets a variable that is used as an iteration variable: it is defined,
    * updated or tested in the head of the `for` statement.
@@ -238,12 +212,6 @@ class WhileStmt extends ConditionalStmt, @whilestmt {
   /** Gets the body of this `while` loop. */
   Stmt getStmt() { result.getParent() = this }
 
-  /**
-   * Gets the statement that is executed whenever the condition
-   * of this branch statement evaluates to true.
-   */
-  deprecated override Stmt getTrueSuccessor() { result = this.getStmt() }
-
   override string pp() { result = "while (...) " + this.getStmt().pp() }
 
   override string toString() { result = "while (...)" }
@@ -261,12 +229,6 @@ class DoStmt extends ConditionalStmt, @dostmt {
   /** Gets the body of this `do` loop. */
   Stmt getStmt() { result.getParent() = this }
 
-  /**
-   * Gets the statement that is executed whenever the condition
-   * of this branch statement evaluates to `true`.
-   */
-  deprecated override Stmt getTrueSuccessor() { result = this.getStmt() }
-
   override string pp() { result = "do " + this.getStmt().pp() + " while (...)" }
 
   override string toString() { result = "do ... while (...)" }
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
index c8f1ff47bd2..631c47583e6 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -131,6 +131,8 @@ private module Frameworks {
   private import semmle.code.java.security.XPath
   private import semmle.code.java.security.XsltInjection
   private import semmle.code.java.frameworks.Jdbc
+  private import semmle.code.java.frameworks.Jdbi
+  private import semmle.code.java.frameworks.HikariCP
   private import semmle.code.java.frameworks.SpringJdbc
   private import semmle.code.java.frameworks.MyBatis
   private import semmle.code.java.frameworks.Hibernate
diff --git a/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll
index 2a58cba6209..b919d143a39 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll
@@ -111,13 +111,6 @@ private predicate evenlyDivisibleExpr(Expr e, int factor) {
   )
 }
 
-/**
- * Holds if `rix` is the number of input edges to `phi`.
- */
-private predicate maxPhiInputRank(SsaPhiNode phi, int rix) {
-  rix = max(int r | rankedPhiInput(phi, _, _, r))
-}
-
 /**
  * Gets the remainder of `val` modulo `mod`.
  *
diff --git a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
index de7aca88434..47c3cdd9db6 100644
--- a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
@@ -725,6 +725,26 @@ private predicate boundedPhiCandValidForEdge(
   )
 }
 
+/**
+ * Holds if `b + delta` is a valid bound for `phi`'s `rix`th input edge.
+ * - `upper = true`  : `phi <= b + delta`
+ * - `upper = false` : `phi >= b + delta`
+ */
+private predicate boundedPhiStep(
+  SsaPhiNode phi, Bound b, int delta, boolean upper, boolean fromBackEdge, int origdelta,
+  Reason reason, int rix
+) {
+  exists(SsaVariable inp, SsaReadPositionPhiInputEdge edge |
+    rankedPhiInput(phi, inp, edge, rix) and
+    boundedPhiCandValidForEdge(phi, b, delta, upper, fromBackEdge, origdelta, reason, inp, edge) and
+    (
+      rix = 1
+      or
+      boundedPhiStep(phi, b, delta, upper, fromBackEdge, origdelta, reason, rix - 1)
+    )
+  )
+}
+
 /**
  * Holds if `b + delta` is a valid bound for `phi`.
  * - `upper = true`  : `phi <= b + delta`
@@ -734,8 +754,9 @@ private predicate boundedPhi(
   SsaPhiNode phi, Bound b, int delta, boolean upper, boolean fromBackEdge, int origdelta,
   Reason reason
 ) {
-  forex(SsaVariable inp, SsaReadPositionPhiInputEdge edge | edge.phiInput(phi, inp) |
-    boundedPhiCandValidForEdge(phi, b, delta, upper, fromBackEdge, origdelta, reason, inp, edge)
+  exists(int r |
+    boundedPhiStep(phi, b, delta, upper, fromBackEdge, origdelta, reason, r) and
+    maxPhiInputRank(phi, r)
   )
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
index f67a211198b..7dc646c179a 100644
--- a/java/ql/lib/semmle/code/java/dataflow/SSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -920,7 +920,7 @@ class SsaVariable extends TSsaVariable {
   }
 
   /** Gets the `ControlFlowNode` at which this SSA variable is defined. */
-  ControlFlowNode getCFGNode() {
+  ControlFlowNode getCfgNode() {
     this = TSsaPhiNode(_, result) or
     this = TSsaCertainUpdate(_, result, _, _) or
     this = TSsaUncertainUpdate(_, result, _, _) or
@@ -928,14 +928,17 @@ class SsaVariable extends TSsaVariable {
     this = TSsaUntracked(_, result)
   }
 
+  /** DEPRECATED: Alias for getCfgNode */
+  deprecated ControlFlowNode getCFGNode() { result = this.getCfgNode() }
+
   /** Gets a textual representation of this SSA variable. */
   string toString() { none() }
 
   /** Gets the source location for this element. */
-  Location getLocation() { result = this.getCFGNode().getLocation() }
+  Location getLocation() { result = this.getCfgNode().getLocation() }
 
   /** Gets the `BasicBlock` in which this SSA variable is defined. */
-  BasicBlock getBasicBlock() { result = this.getCFGNode().getBasicBlock() }
+  BasicBlock getBasicBlock() { result = this.getCfgNode().getBasicBlock() }
 
   /** Gets an access of this SSA variable. */
   RValue getAUse() {
@@ -990,7 +993,7 @@ class SsaUpdate extends SsaVariable {
 class SsaExplicitUpdate extends SsaUpdate, TSsaCertainUpdate {
   SsaExplicitUpdate() {
     exists(VariableUpdate upd |
-      upd = this.getCFGNode() and getDestVar(upd) = this.getSourceVariable()
+      upd = this.getCfgNode() and getDestVar(upd) = this.getSourceVariable()
     )
   }
 
@@ -998,7 +1001,7 @@ class SsaExplicitUpdate extends SsaUpdate, TSsaCertainUpdate {
 
   /** Gets the `VariableUpdate` defining the SSA variable. */
   VariableUpdate getDefiningExpr() {
-    result = this.getCFGNode() and getDestVar(result) = this.getSourceVariable()
+    result = this.getCfgNode() and getDestVar(result) = this.getSourceVariable()
   }
 }
 
@@ -1018,10 +1021,10 @@ class SsaImplicitUpdate extends SsaUpdate {
   private string getKind() {
     this = TSsaUntracked(_, _) and result = "untracked"
     or
-    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _) and
+    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _) and
     result = "explicit qualifier"
     or
-    if uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _)
+    if uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _)
     then
       if exists(this.getANonLocalUpdate())
       then result = "nonlocal + nonlocal qualifier"
@@ -1038,7 +1041,7 @@ class SsaImplicitUpdate extends SsaUpdate {
     exists(SsaSourceField f, Callable setter |
       f = this.getSourceVariable() and
       relevantFieldUpdate(setter, f.getField(), result) and
-      updatesNamedField(this.getCFGNode(), f, setter)
+      updatesNamedField(this.getCfgNode(), f, setter)
     )
   }
 
@@ -1051,8 +1054,8 @@ class SsaImplicitUpdate extends SsaUpdate {
    */
   predicate assignsUnknownValue() {
     this = TSsaUntracked(_, _) or
-    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _) or
-    uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _)
+    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _) or
+    uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _)
   }
 }
 
@@ -1086,7 +1089,7 @@ class SsaImplicitInit extends SsaVariable, TSsaEntryDef {
    */
   predicate isParameterDefinition(Parameter p) {
     this.getSourceVariable() = TLocalVar(p.getCallable(), p) and
-    p.getCallable().getBody() = this.getCFGNode()
+    p.getCallable().getBody() = this.getCfgNode()
   }
 }
 
@@ -1098,7 +1101,7 @@ class SsaPhiNode extends SsaVariable, TSsaPhiNode {
   SsaVariable getAPhiInput() {
     exists(BasicBlock phiPred, TrackedVar v |
       v = this.getSourceVariable() and
-      this.getCFGNode().(BasicBlock).getABBPredecessor() = phiPred and
+      this.getCfgNode().(BasicBlock).getABBPredecessor() = phiPred and
       ssaDefReachesEndOfBlock(v, result, phiPred)
     )
   }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
index 218fe6ef287..f44ed438596 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -476,18 +476,21 @@ class BaseSsaVariable extends TBaseSsaVariable {
   }
 
   /** Gets the `ControlFlowNode` at which this SSA variable is defined. */
-  ControlFlowNode getCFGNode() {
+  ControlFlowNode getCfgNode() {
     this = TSsaPhiNode(_, result) or
     this = TSsaUpdate(_, result, _, _) or
     this = TSsaEntryDef(_, result)
   }
 
+  /** DEPRECATED: Alias for getCfgNode */
+  deprecated ControlFlowNode getCFGNode() { result = this.getCfgNode() }
+
   string toString() { none() }
 
-  Location getLocation() { result = this.getCFGNode().getLocation() }
+  Location getLocation() { result = this.getCfgNode().getLocation() }
 
   /** Gets the `BasicBlock` in which this SSA variable is defined. */
-  BasicBlock getBasicBlock() { result = this.getCFGNode().getBasicBlock() }
+  BasicBlock getBasicBlock() { result = this.getCfgNode().getBasicBlock() }
 
   /** Gets an access of this SSA variable. */
   RValue getAUse() { ssaDefReachesUse(_, this, result) }
@@ -533,7 +536,7 @@ class BaseSsaVariable extends TBaseSsaVariable {
 class BaseSsaUpdate extends BaseSsaVariable, TSsaUpdate {
   BaseSsaUpdate() {
     exists(VariableUpdate upd |
-      upd = this.getCFGNode() and getDestVar(upd) = this.getSourceVariable()
+      upd = this.getCfgNode() and getDestVar(upd) = this.getSourceVariable()
     )
   }
 
@@ -541,7 +544,7 @@ class BaseSsaUpdate extends BaseSsaVariable, TSsaUpdate {
 
   /** Gets the `VariableUpdate` defining the SSA variable. */
   VariableUpdate getDefiningExpr() {
-    result = this.getCFGNode() and getDestVar(result) = this.getSourceVariable()
+    result = this.getCfgNode() and getDestVar(result) = this.getSourceVariable()
   }
 }
 
@@ -562,7 +565,7 @@ class BaseSsaImplicitInit extends BaseSsaVariable, TSsaEntryDef {
    */
   predicate isParameterDefinition(Parameter p) {
     this.getSourceVariable() = TLocalVar(p.getCallable(), p) and
-    p.getCallable().getBody() = this.getCFGNode()
+    p.getCallable().getBody() = this.getCfgNode()
   }
 }
 
@@ -574,7 +577,7 @@ class BaseSsaPhiNode extends BaseSsaVariable, TSsaPhiNode {
   BaseSsaVariable getAPhiInput() {
     exists(BasicBlock phiPred, BaseSsaSourceVariable v |
       v = this.getSourceVariable() and
-      this.getCFGNode().(BasicBlock).getABBPredecessor() = phiPred and
+      this.getCfgNode().(BasicBlock).getABBPredecessor() = phiPred and
       ssaDefReachesEndOfBlock(v, result, phiPred)
     )
   }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
index 49798e484dd..30031931ed9 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
@@ -416,3 +416,13 @@ private class MyConsistencyConfiguration extends Consistency::ConsistencyConfigu
     n.getType() instanceof ImmutableType or n instanceof ImplicitVarargsArray
   }
 }
+
+/**
+ * Holds if the the content `c` is a container.
+ */
+predicate containerContent(Content c) {
+  c instanceof ArrayContent or
+  c instanceof CollectionContent or
+  c instanceof MapKeyContent or
+  c instanceof MapValueContent
+}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
index eb59ee5f06a..f4fbcf0045f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
@@ -196,7 +196,7 @@ predicate interpretInputSpecific(string c, InterpretNode mid, InterpretNode n) {
   exists(FieldWrite fw |
     c = "" and
     fw.getField() = mid.asElement() and
-    n.asNode().asExpr() = fw.getRHS()
+    n.asNode().asExpr() = fw.getRhs()
   )
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
index d408e3f5e0b..b1422e89552 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -62,13 +62,6 @@ private module Cached {
     )
   }
 
-  private predicate containerContent(DataFlow::Content c) {
-    c instanceof DataFlow::ArrayContent or
-    c instanceof DataFlow::CollectionContent or
-    c instanceof DataFlow::MapKeyContent or
-    c instanceof DataFlow::MapValueContent
-  }
-
   /**
    * Holds if taint can flow in one local step from `src` to `sink` excluding
    * local data flow steps. That is, `src` and `sink` are likely to represent
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 fc17dbfd979..c5d5bc98009 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
@@ -111,24 +111,4 @@ module Private {
   predicate ssaUpdateStep = RU::ssaUpdateStep/3;
 
   Expr getABasicBlockExpr(BasicBlock bb) { result = bb.getANode() }
-
-  private predicate id(BasicBlock x, BasicBlock y) { x = y }
-
-  private predicate idOf(BasicBlock x, int y) = equivalenceRelation(id/2)(x, y)
-
-  private int getId(BasicBlock bb) { idOf(bb, result) }
-
-  /**
-   * Holds if `inp` is an input to `phi` along `edge` and this input has index `r`
-   * in an arbitrary 1-based numbering of the input edges to `phi`.
-   */
-  predicate rankedPhiInput(SsaPhiNode phi, SsaVariable inp, SsaReadPositionPhiInputEdge edge, int r) {
-    edge.phiInput(phi, inp) and
-    edge =
-      rank[r](SsaReadPositionPhiInputEdge e |
-        e.phiInput(phi, _)
-      |
-        e order by getId(e.getOrigBlock())
-      )
-  }
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll
index e450c11b5ab..08335f6680d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll
@@ -3,6 +3,7 @@
  */
 
 private import SsaReadPositionSpecific
+import SsaReadPositionSpecific::Public
 
 private newtype TSsaReadPosition =
   TSsaReadPositionBlock(BasicBlock bb) { bb = getAReadBasicBlock(_) } or
@@ -55,3 +56,10 @@ class SsaReadPositionPhiInputEdge extends SsaReadPosition, TSsaReadPositionPhiIn
 
   override string toString() { result = "edge" }
 }
+
+/**
+ * Holds if `rix` is the number of input edges to `phi`.
+ */
+predicate maxPhiInputRank(SsaPhiNode phi, int rix) {
+  rix = max(int r | rankedPhiInput(phi, _, _, r))
+}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
index dcfc3d69e32..410dc6b5cfe 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
@@ -4,6 +4,7 @@
 
 private import semmle.code.java.dataflow.SSA as Ssa
 private import semmle.code.java.controlflow.BasicBlocks as BB
+private import SsaReadPositionCommon
 
 class SsaVariable = Ssa::SsaVariable;
 
@@ -13,3 +14,28 @@ class BasicBlock = BB::BasicBlock;
 
 /** Gets a basic block in which SSA variable `v` is read. */
 BasicBlock getAReadBasicBlock(SsaVariable v) { result = v.getAUse().getBasicBlock() }
+
+private predicate id(BasicBlock x, BasicBlock y) { x = y }
+
+private predicate idOf(BasicBlock x, int y) = equivalenceRelation(id/2)(x, y)
+
+private int getId(BasicBlock bb) { idOf(bb, result) }
+
+/**
+ * Declarations to be exposed to users of SsaReadPositionCommon
+ */
+module Public {
+  /**
+   * Holds if `inp` is an input to `phi` along `edge` and this input has index `r`
+   * in an arbitrary 1-based numbering of the input edges to `phi`.
+   */
+  predicate rankedPhiInput(SsaPhiNode phi, SsaVariable inp, SsaReadPositionPhiInputEdge edge, int r) {
+    edge.phiInput(phi, inp) and
+    edge =
+      rank[r](SsaReadPositionPhiInputEdge e |
+        e.phiInput(phi, _)
+      |
+        e order by getId(e.getOrigBlock())
+      )
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
index cbb29066102..027e2392252 100644
--- a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
@@ -427,8 +427,8 @@ class PersistenceCallbackMethod extends CallableEntryPoint {
  * A source class which is referred to by fully qualified name in the value of an arbitrary XML
  * attribute which has a name containing "className" or "ClassName".
  */
-class ArbitraryXMLEntryPoint extends ReflectivelyConstructedClass {
-  ArbitraryXMLEntryPoint() {
+class ArbitraryXmlEntryPoint extends ReflectivelyConstructedClass {
+  ArbitraryXmlEntryPoint() {
     this.fromSource() and
     exists(XMLAttribute attribute |
       attribute.getName() = "className" or
@@ -446,6 +446,9 @@ class ArbitraryXMLEntryPoint extends ReflectivelyConstructedClass {
   }
 }
 
+/** DEPRECATED: Alias for ArbitraryXmlEntryPoint */
+deprecated class ArbitraryXMLEntryPoint = ArbitraryXmlEntryPoint;
+
 /** A Selenium PageObject, created by a call to PageFactory.initElements(..). */
 class SeleniumPageObjectEntryPoint extends ReflectivelyConstructedClass {
   SeleniumPageObjectEntryPoint() { this instanceof SeleniumPageObject }
diff --git a/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll
index 4929ba2b7f2..562c7ef7c1c 100644
--- a/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll
@@ -13,7 +13,7 @@ class SpringInjectionCallableEntryPoint extends CallableEntryPoint {
     this instanceof SpringBeanReflectivelyConstructed or
     // A setter method specified in the context.
     this instanceof SpringBeanPropertySetterMethod or
-    exists(this.(SpringBeanXMLAutowiredSetterMethod).getInjectedBean()) or
+    exists(this.(SpringBeanXmlAutowiredSetterMethod).getInjectedBean()) or
     this instanceof SpringBeanAutowiredCallable
   }
 }
diff --git a/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll
index b061502fffe..836ad5a1f55 100644
--- a/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll
@@ -14,7 +14,7 @@ class ServletConstructedClass extends ReflectivelyConstructedClass {
     // referred to as a servlet-class in at least one. If no `web.xml` files are found, we assume
     // that XML extraction was not enabled, and therefore consider all `Servlet` classes as live.
     (
-      isWebXMLIncluded()
+      isWebXmlIncluded()
       implies
       exists(WebServletClass servletClass | this = servletClass.getClass())
     )
@@ -29,12 +29,12 @@ class ServletConstructedClass extends ReflectivelyConstructedClass {
  */
 class ServletListenerClass extends ReflectivelyConstructedClass {
   ServletListenerClass() {
-    this.getAnAncestor() instanceof ServletWebXMLListenerType and
+    this.getAnAncestor() instanceof ServletWebXmlListenerType and
     // If we have seen any `web.xml` files, this listener will be considered to be live only if it is
     // referred to as a listener-class in at least one. If no `web.xml` files are found, we assume
     // that XML extraction was not enabled, and therefore consider all listener classes as live.
     (
-      isWebXMLIncluded()
+      isWebXmlIncluded()
       implies
       exists(WebListenerClass listenerClass | this = listenerClass.getClass())
     )
@@ -51,7 +51,7 @@ class ServletFilterClass extends ReflectivelyConstructedClass {
     // If we have seen any `web.xml` files, this filter will be considered to be live only if it is
     // referred to as a filter-class in at least one. If no `web.xml` files are found, we assume
     // that XML extraction was not enabled, and therefore consider all filter classes as live.
-    (isWebXMLIncluded() implies exists(WebFilterClass filterClass | this = filterClass.getClass()))
+    (isWebXmlIncluded() implies exists(WebFilterClass filterClass | this = filterClass.getClass()))
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/Camel.qll b/java/ql/lib/semmle/code/java/frameworks/Camel.qll
index 09bfa73d460..0d7161e5f8f 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Camel.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Camel.qll
@@ -12,7 +12,7 @@ import semmle.code.java.frameworks.camel.CamelJavaAnnotations
  */
 class CamelToURI extends string {
   CamelToURI() {
-    exists(SpringCamelXMLToElement toXMLElement | this = toXMLElement.getURI()) or
+    exists(SpringCamelXmlToElement toXmlElement | this = toXmlElement.getURI()) or
     exists(CamelJavaDSLToDecl toJavaDSL | this = toJavaDSL.getURI())
   }
 }
@@ -56,17 +56,17 @@ class CamelToBeanURI extends CamelToURI {
  */
 class CamelTargetClass extends Class {
   CamelTargetClass() {
-    exists(SpringCamelXMLBeanRef camelXMLBeanRef |
+    exists(SpringCamelXmlBeanRef camelXmlBeanRef |
       // A target may be defined by referencing an existing Spring Bean.
-      this = camelXMLBeanRef.getRefBean().getClass()
+      this = camelXmlBeanRef.getRefBean().getClass()
       or
       // A target may be defined by referencing a class, which Apache Camel will create into a bean.
-      this = camelXMLBeanRef.getBeanType()
+      this = camelXmlBeanRef.getBeanType()
     )
     or
     exists(CamelToBeanURI toBeanURI | this = toBeanURI.getRefBean().getClass())
     or
-    exists(SpringCamelXMLMethodElement xmlMethod |
+    exists(SpringCamelXmlMethodElement xmlMethod |
       this = xmlMethod.getRefBean().getClass() or
       this = xmlMethod.getBeanType()
     )
diff --git a/java/ql/lib/semmle/code/java/frameworks/HikariCP.qll b/java/ql/lib/semmle/code/java/frameworks/HikariCP.qll
new file mode 100644
index 00000000000..30b4ba63405
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/HikariCP.qll
@@ -0,0 +1,17 @@
+/**
+ * Definitions of sinks in the Hikari Connection Pool library.
+ */
+
+import java
+import semmle.code.java.dataflow.ExternalFlow
+
+private class SsrfSinkCsv extends SinkModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        //"package;type;overrides;name;signature;ext;spec;kind"
+        "com.zaxxer.hikari;HikariConfig;false;HikariConfig;(Properties);;Argument[0];jdbc-url",
+        "com.zaxxer.hikari;HikariConfig;false;setJdbcUrl;(String);;Argument[0];jdbc-url"
+      ]
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/Jdbc.qll b/java/ql/lib/semmle/code/java/frameworks/Jdbc.qll
index b851842dfd3..5a20399f9db 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Jdbc.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Jdbc.qll
@@ -52,3 +52,16 @@ private class SqlSinkCsv extends SinkModelCsv {
       ]
   }
 }
+
+private class SsrfSinkCsv extends SinkModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        //"package;type;overrides;name;signature;ext;spec;kind"
+        "java.sql;DriverManager;false;getConnection;(String);;Argument[0];jdbc-url",
+        "java.sql;DriverManager;false;getConnection;(String,Properties);;Argument[0];jdbc-url",
+        "java.sql;DriverManager;false;getConnection;(String,String,String);;Argument[0];jdbc-url",
+        "java.sql;Driver;false;connect;(String,Properties);;Argument[0];jdbc-url"
+      ]
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/Jdbi.qll b/java/ql/lib/semmle/code/java/frameworks/Jdbi.qll
new file mode 100644
index 00000000000..a2984805ce7
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/Jdbi.qll
@@ -0,0 +1,21 @@
+/**
+ * Definitions of sinks in the JDBI library.
+ */
+
+import java
+import semmle.code.java.dataflow.ExternalFlow
+
+private class SsrfSinkCsv extends SinkModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        //"package;type;overrides;name;signature;ext;spec;kind"
+        "org.jdbi.v3.core;Jdbi;false;create;(String);;Argument[0];jdbc-url",
+        "org.jdbi.v3.core;Jdbi;false;create;(String,Properties);;Argument[0];jdbc-url",
+        "org.jdbi.v3.core;Jdbi;false;create;(String,String,String);;Argument[0];jdbc-url",
+        "org.jdbi.v3.core;Jdbi;false;open;(String);;Argument[0];jdbc-url",
+        "org.jdbi.v3.core;Jdbi;false;open;(String,Properties);;Argument[0];jdbc-url",
+        "org.jdbi.v3.core;Jdbi;false;open;(String,String,String);;Argument[0];jdbc-url"
+      ]
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/Networking.qll b/java/ql/lib/semmle/code/java/frameworks/Networking.qll
index 1ab9c74e0ca..66a798f40d3 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Networking.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Networking.qll
@@ -4,7 +4,7 @@
 
 import semmle.code.java.Type
 
-/** The type `java.net.URLConnection`. */
+/** The type `java.net.UrlConnection`. */
 class TypeUrlConnection extends RefType {
   TypeUrlConnection() { this.hasQualifiedName("java.net", "URLConnection") }
 }
@@ -29,15 +29,18 @@ class TypeUri extends RefType {
   TypeUri() { this.hasQualifiedName("java.net", "URI") }
 }
 
-/** The method `java.net.URLConnection::getInputStream`. */
-class URLConnectionGetInputStreamMethod extends Method {
-  URLConnectionGetInputStreamMethod() {
+/** The method `java.net.UrlConnection::getInputStream`. */
+class UrlConnectionGetInputStreamMethod extends Method {
+  UrlConnectionGetInputStreamMethod() {
     this.getDeclaringType() instanceof TypeUrlConnection and
     this.hasName("getInputStream") and
     this.hasNoParameters()
   }
 }
 
+/** DEPRECATED: Alias for UrlConnectionGetInputStreamMethod */
+deprecated class URLConnectionGetInputStreamMethod = UrlConnectionGetInputStreamMethod;
+
 /** The method `java.net.Socket::getInputStream`. */
 class SocketGetInputStreamMethod extends Method {
   SocketGetInputStreamMethod() {
diff --git a/java/ql/lib/semmle/code/java/frameworks/Servlets.qll b/java/ql/lib/semmle/code/java/frameworks/Servlets.qll
index 81f334015bd..de82d49a7aa 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Servlets.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Servlets.qll
@@ -120,14 +120,17 @@ library class HttpServletRequestGetHeaderNamesMethod extends Method {
 /**
  * The method `getRequestURL()` declared in `javax.servlet.http.HttpServletRequest`.
  */
-class HttpServletRequestGetRequestURLMethod extends Method {
-  HttpServletRequestGetRequestURLMethod() {
+class HttpServletRequestGetRequestUrlMethod extends Method {
+  HttpServletRequestGetRequestUrlMethod() {
     this.getDeclaringType() instanceof HttpServletRequest and
     this.hasName("getRequestURL") and
     this.getNumberOfParameters() = 0
   }
 }
 
+/** DEPRECATED: Alias for HttpServletRequestGetRequestUrlMethod */
+deprecated class HttpServletRequestGetRequestURLMethod = HttpServletRequestGetRequestUrlMethod;
+
 /**
  * The method `getRequestURI()` declared in `javax.servlet.http.HttpServletRequest`.
  */
@@ -318,8 +321,8 @@ class ServletClass extends Class {
  * Note: There are a number of other listener interfaces in the `javax.servlet` package that cannot
  * be configured in `web.xml` and therefore are not covered by this class.
  */
-class ServletWebXMLListenerType extends RefType {
-  ServletWebXMLListenerType() {
+class ServletWebXmlListenerType extends RefType {
+  ServletWebXmlListenerType() {
     this.hasQualifiedName("javax.servlet", "ServletContextAttributeListener") or
     this.hasQualifiedName("javax.servlet", "ServletContextListener") or
     this.hasQualifiedName("javax.servlet", "ServletRequestAttributeListener") or
@@ -333,6 +336,9 @@ class ServletWebXMLListenerType extends RefType {
   }
 }
 
+/** DEPRECATED: Alias for ServletWebXmlListenerType */
+deprecated class ServletWebXMLListenerType = ServletWebXmlListenerType;
+
 /** Holds if `m` is a request handler method (for example `doGet` or `doPost`). */
 predicate isServletRequestMethod(Method m) {
   m.getDeclaringType() instanceof ServletClass and
diff --git a/java/ql/lib/semmle/code/java/frameworks/SpringJdbc.qll b/java/ql/lib/semmle/code/java/frameworks/SpringJdbc.qll
index ed7cdfd527f..067c686b912 100644
--- a/java/ql/lib/semmle/code/java/frameworks/SpringJdbc.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/SpringJdbc.qll
@@ -37,3 +37,17 @@ private class SqlSinkCsv extends SinkModelCsv {
       ]
   }
 }
+
+private class SsrfSinkCsv extends SinkModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        //"package;type;overrides;name;signature;ext;spec;kind"
+        "org.springframework.boot.jdbc;DataSourceBuilder;false;url;(String);;Argument[0];jdbc-url",
+        "org.springframework.jdbc.datasource;AbstractDriverBasedDataSource;false;setUrl;(String);;Argument[0];jdbc-url",
+        "org.springframework.jdbc.datasource;DriverManagerDataSource;false;DriverManagerDataSource;(String);;Argument[0];jdbc-url",
+        "org.springframework.jdbc.datasource;DriverManagerDataSource;false;DriverManagerDataSource;(String,String,String);;Argument[0];jdbc-url",
+        "org.springframework.jdbc.datasource;DriverManagerDataSource;false;DriverManagerDataSource;(String,Properties);;Argument[0];jdbc-url"
+      ]
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
index 88156da0264..2bac6eb5ce2 100644
--- a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
@@ -25,12 +25,15 @@ class TypeUnboundIdLdapFilter extends Class {
 }
 
 /** The class `com.unboundid.ldap.sdk.LDAPConnection`. */
-class TypeUnboundIdLDAPConnection extends Class {
-  TypeUnboundIdLDAPConnection() {
+class TypeUnboundIdLdapConnection extends Class {
+  TypeUnboundIdLdapConnection() {
     this.hasQualifiedName("com.unboundid.ldap.sdk", "LDAPConnection")
   }
 }
 
+/** DEPRECATED: Alias for TypeUnboundIdLdapConnection */
+deprecated class TypeUnboundIdLDAPConnection = TypeUnboundIdLdapConnection;
+
 /*--- Methods ---*/
 /** A method with the name `setBaseDN` declared in `com.unboundid.ldap.sdk.SearchRequest`. */
 class MethodUnboundIdSearchRequestSetBaseDN extends Method {
@@ -89,25 +92,36 @@ class MethodUnboundIdFilterSimplifyFilter extends Method {
 }
 
 /** A method with the name `search` declared in `com.unboundid.ldap.sdk.LDAPConnection`. */
-class MethodUnboundIdLDAPConnectionSearch extends Method {
-  MethodUnboundIdLDAPConnectionSearch() {
-    this.getDeclaringType() instanceof TypeUnboundIdLDAPConnection and
+class MethodUnboundIdLdapConnectionSearch extends Method {
+  MethodUnboundIdLdapConnectionSearch() {
+    this.getDeclaringType() instanceof TypeUnboundIdLdapConnection and
     this.hasName("search")
   }
 }
 
+/** DEPRECATED: Alias for MethodUnboundIdLdapConnectionSearch */
+deprecated class MethodUnboundIdLDAPConnectionSearch = MethodUnboundIdLdapConnectionSearch;
+
 /** A method with the name `asyncSearch` declared in `com.unboundid.ldap.sdk.LDAPConnection`. */
-class MethodUnboundIdLDAPConnectionAsyncSearch extends Method {
-  MethodUnboundIdLDAPConnectionAsyncSearch() {
-    this.getDeclaringType() instanceof TypeUnboundIdLDAPConnection and
+class MethodUnboundIdLdapConnectionAsyncSearch extends Method {
+  MethodUnboundIdLdapConnectionAsyncSearch() {
+    this.getDeclaringType() instanceof TypeUnboundIdLdapConnection and
     this.hasName("asyncSearch")
   }
 }
 
+/** DEPRECATED: Alias for MethodUnboundIdLdapConnectionAsyncSearch */
+deprecated class MethodUnboundIdLDAPConnectionAsyncSearch =
+  MethodUnboundIdLdapConnectionAsyncSearch;
+
 /** A method with the name `searchForEntry` declared in `com.unboundid.ldap.sdk.LDAPConnection`. */
-class MethodUnboundIdLDAPConnectionSearchForEntry extends Method {
-  MethodUnboundIdLDAPConnectionSearchForEntry() {
-    this.getDeclaringType() instanceof TypeUnboundIdLDAPConnection and
+class MethodUnboundIdLdapConnectionSearchForEntry extends Method {
+  MethodUnboundIdLdapConnectionSearchForEntry() {
+    this.getDeclaringType() instanceof TypeUnboundIdLdapConnection and
     this.hasName("searchForEntry")
   }
 }
+
+/** DEPRECATED: Alias for MethodUnboundIdLdapConnectionSearchForEntry */
+deprecated class MethodUnboundIdLDAPConnectionSearchForEntry =
+  MethodUnboundIdLdapConnectionSearchForEntry;
diff --git a/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll
index 3ac223be2d5..f3d5c58c0ce 100644
--- a/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll
@@ -5,7 +5,7 @@ import semmle.code.xml.XML
 /**
  * Holds if any `*.gwt.xml` files are included in this snapshot.
  */
-predicate isGwtXmlIncluded() { exists(GwtXmlFile webXML) }
+predicate isGwtXmlIncluded() { exists(GwtXmlFile webXml) }
 
 /** A GWT module XML file with a `.gwt.xml` suffix. */
 class GwtXmlFile extends XMLFile {
diff --git a/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll b/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll
index 8a6ee13ec57..0e74408bca1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll
@@ -10,8 +10,8 @@ import semmle.code.java.dataflow.ExternalFlow
  * and is prone to SQL injection.
  * https://www.jooq.org/doc/current/manual/sql-building/plain-sql/
  */
-private class PlainSQLType extends Annotation {
-  PlainSQLType() { this.getType().hasQualifiedName("org.jooq", "PlainSQL") }
+private class PlainSqlType extends Annotation {
+  PlainSqlType() { this.getType().hasQualifiedName("org.jooq", "PlainSQL") }
 }
 
 /**
@@ -19,7 +19,7 @@ private class PlainSQLType extends Annotation {
  * first argument.
  */
 predicate jOOQSqlMethod(Method m) {
-  m.getAnAnnotation() instanceof PlainSQLType and
+  m.getAnAnnotation() instanceof PlainSqlType and
   m.getParameterType(0) instanceof TypeString
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll b/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll
index bf87e7fbc57..1fb2e377841 100644
--- a/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll
@@ -14,14 +14,17 @@ private import semmle.code.java.dataflow.ExternalFlow
 /**
  * A `@com.fasterxml.jackson.annotation.JsonIgnore` annoation.
  */
-class JacksonJSONIgnoreAnnotation extends NonReflectiveAnnotation {
-  JacksonJSONIgnoreAnnotation() {
+class JacksonJsonIgnoreAnnotation extends NonReflectiveAnnotation {
+  JacksonJsonIgnoreAnnotation() {
     exists(AnnotationType anntp | anntp = this.getType() |
       anntp.hasQualifiedName("com.fasterxml.jackson.annotation", "JsonIgnore")
     )
   }
 }
 
+/** DEPRECATED: Alias for JacksonJsonIgnoreAnnotation */
+deprecated class JacksonJSONIgnoreAnnotation = JacksonJsonIgnoreAnnotation;
+
 /** A type whose values may be serialized using the Jackson JSON framework. */
 abstract class JacksonSerializableType extends Type { }
 
@@ -143,7 +146,7 @@ class JacksonSerializableField extends SerializableField {
       not superType instanceof TypeObject and
       superType.fromSource()
     ) and
-    not this.getAnAnnotation() instanceof JacksonJSONIgnoreAnnotation
+    not this.getAnAnnotation() instanceof JacksonJsonIgnoreAnnotation
   }
 }
 
@@ -155,7 +158,7 @@ class JacksonDeserializableField extends DeserializableField {
       not superType instanceof TypeObject and
       superType.fromSource()
     ) and
-    not this.getAnAnnotation() instanceof JacksonJSONIgnoreAnnotation
+    not this.getAnAnnotation() instanceof JacksonJsonIgnoreAnnotation
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
index 1d6c08c4862..326bfe34381 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
@@ -67,8 +67,8 @@ class FacesComponent extends Class {
       )
       or
       // Or in an XML file
-      exists(FacesConfigComponentClass componentClassXML |
-        this = componentClassXML.getFacesComponentClass()
+      exists(FacesConfigComponentClass componentClassXml |
+        this = componentClassXml.getFacesComponentClass()
       )
     )
   }
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll
index 82fc32baca2..077c2baf862 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll
@@ -8,8 +8,8 @@ import java
 /**
  * A JavaEE persistence configuration XML file (persistence.xml).
  */
-class PersistenceXMLFile extends XMLFile {
-  PersistenceXMLFile() { this.getStem() = "persistence" }
+class PersistenceXmlFile extends XMLFile {
+  PersistenceXmlFile() { this.getStem() = "persistence" }
 
   /** Gets the root XML element in this `persistence.xml` file. */
   PersistenceXmlRoot getRoot() { result = this.getAChild() }
@@ -26,10 +26,13 @@ class PersistenceXMLFile extends XMLFile {
   }
 }
 
+/** DEPRECATED: Alias for PersistenceXmlFile */
+deprecated class PersistenceXMLFile = PersistenceXmlFile;
+
 /** The root `persistence` XML element in a `persistence.xml` file. */
 class PersistenceXmlRoot extends XMLElement {
   PersistenceXmlRoot() {
-    this.getParent() instanceof PersistenceXMLFile and
+    this.getParent() instanceof PersistenceXmlFile and
     this.getName() = "persistence"
   }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
index 58968c753ac..5a65891020a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
@@ -22,7 +22,7 @@ class SessionEJB extends EJB {
     this.getAnAnnotation().getType().hasName("Stateless") or
     this.getAnAnnotation().getType().hasName("Stateful") or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getAnEjbClassElement().getACharactersSet().getCharacters()
     )
@@ -121,7 +121,7 @@ class StatefulSessionEJB extends SessionEJB {
     this.getAnAnnotation().getType().hasName("Stateful")
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters() and
       se.getASessionTypeElement().isStateful()
@@ -138,7 +138,7 @@ class StatelessSessionEJB extends SessionEJB {
     this.getAnAnnotation().getType().hasName("Stateless")
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters() and
       se.getASessionTypeElement().isStateless()
@@ -158,7 +158,7 @@ class MessageDrivenBean extends EJB {
     this.getAnAnnotation().getType().hasName("MessageDriven")
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getAMessageDrivenElement().getAnEjbClassElement().getACharactersSet().getCharacters()
     )
@@ -174,7 +174,7 @@ class EntityEJB extends EJB {
     this instanceof EntityBean
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getAnEntityElement().getAnEjbClassElement().getACharactersSet().getCharacters()
     )
@@ -245,14 +245,14 @@ abstract class BusinessInterface extends Interface {
  */
 class XmlSpecifiedBusinessInterface extends BusinessInterface {
   XmlSpecifiedBusinessInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getABusinessElement().getACharactersSet().getCharacters()
     )
   }
 
   override SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getABusinessElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -260,14 +260,14 @@ class XmlSpecifiedBusinessInterface extends BusinessInterface {
   }
 
   override predicate isDeclaredLocal() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getABusinessLocalElement().getACharactersSet().getCharacters()
     )
   }
 
   override predicate isDeclaredRemote() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getABusinessRemoteElement().getACharactersSet().getCharacters()
     )
@@ -411,7 +411,7 @@ class ExtendedRemoteInterface extends LegacyEjbRemoteInterface, RemoteEJBInterfa
 /** A legacy remote interface specified within an XML deployment descriptor. */
 class XmlSpecifiedRemoteInterface extends LegacyEjbRemoteInterface {
   XmlSpecifiedRemoteInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getARemoteElement().getACharactersSet().getCharacters()
     )
@@ -422,7 +422,7 @@ class XmlSpecifiedRemoteInterface extends LegacyEjbRemoteInterface {
    * for this legacy EJB remote interface.
    */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getARemoteElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -453,7 +453,7 @@ class AnnotatedRemoteHomeInterface extends LegacyEjbRemoteHomeInterface {
 /** A legacy remote home interface specified within an XML deployment descriptor. */
 class XmlSpecifiedRemoteHomeInterface extends LegacyEjbRemoteHomeInterface {
   XmlSpecifiedRemoteHomeInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getARemoteHomeElement().getACharactersSet().getCharacters()
     )
@@ -461,7 +461,7 @@ class XmlSpecifiedRemoteHomeInterface extends LegacyEjbRemoteHomeInterface {
 
   /** Gets an EJB to which this interface belongs. */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getARemoteHomeElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -478,7 +478,7 @@ class ExtendedLocalInterface extends LegacyEjbLocalInterface, LocalEJBInterface
 /** A legacy local interface specified within an XML deployment descriptor. */
 class XmlSpecifiedLocalInterface extends LegacyEjbLocalInterface {
   XmlSpecifiedLocalInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getALocalElement().getACharactersSet().getCharacters()
     )
@@ -486,7 +486,7 @@ class XmlSpecifiedLocalInterface extends LegacyEjbLocalInterface {
 
   /** Gets an EJB to which this interface belongs. */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getALocalElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -517,7 +517,7 @@ class AnnotatedLocalHomeInterface extends LegacyEjbLocalHomeInterface {
 /** A legacy local home interface specified within an XML deployment descriptor. */
 class XmlSpecifiedLocalHomeInterface extends LegacyEjbLocalHomeInterface {
   XmlSpecifiedLocalHomeInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getALocalHomeElement().getACharactersSet().getCharacters()
     )
@@ -525,7 +525,7 @@ class XmlSpecifiedLocalHomeInterface extends LegacyEjbLocalHomeInterface {
 
   /** Gets an EJB to which this interface belongs. */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getALocalHomeElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll
index db89836ff9d..4122869ecdb 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll
@@ -8,8 +8,8 @@ import java
 /**
  * An EJB deployment descriptor XML file named `ejb-jar.xml`.
  */
-class EjbJarXMLFile extends XMLFile {
-  EjbJarXMLFile() { this.getStem() = "ejb-jar" }
+class EjbJarXmlFile extends XMLFile {
+  EjbJarXmlFile() { this.getStem() = "ejb-jar" }
 
   /** Gets the root `ejb-jar` XML element of this `ejb-jar.xml` file. */
   EjbJarRootElement getRoot() { result = this.getAChild() }
@@ -35,10 +35,13 @@ class EjbJarXMLFile extends XMLFile {
   }
 }
 
+/** DEPRECATED: Alias for EjbJarXmlFile */
+deprecated class EjbJarXMLFile = EjbJarXmlFile;
+
 /** The root `ejb-jar` XML element in an `ejb-jar.xml` file. */
 class EjbJarRootElement extends XMLElement {
   EjbJarRootElement() {
-    this.getParent() instanceof EjbJarXMLFile and
+    this.getParent() instanceof EjbJarXmlFile and
     this.getName() = "ejb-jar"
   }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll
index e5e459c93bc..23e1518c916 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll
@@ -9,26 +9,6 @@ import EJB
 /** A method or constructor that may not be called from an EJB. */
 abstract class ForbiddenCallable extends Callable { }
 
-/**
- * Specialized version of the `polyCalls(..)` predicate for the use
- * case of finding "shortest" call chains from EJBs to forbidden
- * methods. This is the same as `polyCalls(..)`, with two exceptions:
- *
- * - It does not consider calls into an EJB method.
- * - It does not consider calls from "forbidden callables".
- */
-private predicate ejbPolyCalls(Callable origin, Callable target) {
-  origin.polyCalls(target) and
-  not exists(EJB ejb | target = ejb.getACallable()) and
-  not origin instanceof ForbiddenCallable
-}
-
-private predicate ejbPolyCallsPlus(Callable origin, Callable target) {
-  exists(EJB ejb | origin = ejb.getACallable() | ejbPolyCalls(origin, target))
-  or
-  exists(Callable mid | ejbPolyCallsPlus(origin, mid) and ejbPolyCalls(mid, target))
-}
-
 /**
  * Holds if there exists a call chain from an EJB-`Callable` `origin` to a `ForbiddenCallable` `target`
  * that does not contain any intermediate EJB-`Callable` or `ForbiddenCallable`,
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll
index 2d6721298a9..657df736c4c 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll
@@ -8,19 +8,22 @@ import default
  * A JSF "application configuration resources file", typically called `faces-config.xml`, which
  * contains the configuration for a JSF application
  */
-class FacesConfigXMLFile extends XMLFile {
-  FacesConfigXMLFile() {
+class FacesConfigXmlFile extends XMLFile {
+  FacesConfigXmlFile() {
     // Contains a single top-level XML node named "faces-Config".
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "faces-config"
   }
 }
 
+/** DEPRECATED: Alias for FacesConfigXmlFile */
+deprecated class FacesConfigXMLFile = FacesConfigXmlFile;
+
 /**
  * An XML element in a `FacesConfigXMLFile`.
  */
-class FacesConfigXMLElement extends XMLElement {
-  FacesConfigXMLElement() { this.getFile() instanceof FacesConfigXMLFile }
+class FacesConfigXmlElement extends XMLElement {
+  FacesConfigXmlElement() { this.getFile() instanceof FacesConfigXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -28,17 +31,20 @@ class FacesConfigXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for FacesConfigXmlElement */
+deprecated class FacesConfigXMLElement = FacesConfigXmlElement;
+
 /**
  * An element in a JSF config file that declares a managed bean.
  */
-class FacesConfigManagedBean extends FacesConfigXMLElement {
+class FacesConfigManagedBean extends FacesConfigXmlElement {
   FacesConfigManagedBean() { this.getName() = "managed-bean" }
 }
 
 /**
  * An element in a JSF config file that declares the Class of a managed bean.
  */
-class FacesConfigManagedBeanClass extends FacesConfigXMLElement {
+class FacesConfigManagedBeanClass extends FacesConfigXmlElement {
   FacesConfigManagedBeanClass() {
     this.getName() = "managed-bean-class" and
     this.getParent() instanceof FacesConfigManagedBean
@@ -53,14 +59,14 @@ class FacesConfigManagedBeanClass extends FacesConfigXMLElement {
 /**
  * An element in a JSF config file that declares a custom component.
  */
-class FacesConfigComponent extends FacesConfigXMLElement {
+class FacesConfigComponent extends FacesConfigXmlElement {
   FacesConfigComponent() { this.getName() = "component" }
 }
 
 /**
  * An element in a JSF config file that declares the Class of a faces component.
  */
-class FacesConfigComponentClass extends FacesConfigXMLElement {
+class FacesConfigComponentClass extends FacesConfigXmlElement {
   FacesConfigComponentClass() {
     this.getName() = "component-class" and
     this.getParent() instanceof FacesConfigComponent
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll
index 685c22779f3..4dd4b0ab947 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A common supertype of `SpringRef` and `SpringIdRef`. */
-class SpringAbstractRef extends SpringXMLElement {
+class SpringAbstractRef extends SpringXmlElement {
   SpringAbstractRef() {
     this.getName() = "idref" or
     this.getName() = "ref"
@@ -29,7 +29,7 @@ class SpringAbstractRef extends SpringXMLElement {
   }
 
   /** Holds if `other` is also a reference and points to the same bean as this reference. */
-  override predicate isSimilar(SpringXMLElement other) {
+  override predicate isSimilar(SpringXmlElement other) {
     exists(SpringAbstractRef otherRef |
       otherRef = other and
       this.getBean() = otherRef.getBean()
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll
index a3aa0fd38ac..cbc4f025dac 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** An `<alias>` element in Spring XML files. */
-class SpringAlias extends SpringXMLElement {
+class SpringAlias extends SpringXmlElement {
   SpringAlias() { this.getName() = "alias" }
 
   /** Gets the value of the `alias` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll
index 285c34d48e4..bddf5f01f9e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** An `<arg-type>` element in Spring XML files. */
-class SpringArgType extends SpringXMLElement {
+class SpringArgType extends SpringXmlElement {
   SpringArgType() { this.getName() = "arg-type" }
 
   /** Gets the value of the `match` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll
index 1f2f2a13e68..a20eef4d0d7 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** An `<attribute>` element in Spring XML files. */
-class SpringAttribute extends SpringXMLElement {
+class SpringAttribute extends SpringXmlElement {
   SpringAttribute() { this.getName() = "attribute" }
 
   /** Gets the value of the `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll
index f387b40a547..b99dafecc65 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll
@@ -58,8 +58,8 @@ class SpringBeanPropertySetterMethod extends Method {
  *
  * Confusingly, this is a different form of autowiring to the `@Autowired` annotation.
  */
-class SpringBeanXMLAutowiredSetterMethod extends Method {
-  SpringBeanXMLAutowiredSetterMethod() {
+class SpringBeanXmlAutowiredSetterMethod extends Method {
+  SpringBeanXmlAutowiredSetterMethod() {
     // The bean as marked with some form of autowiring in the XML file.
     exists(string xmlAutowire |
       xmlAutowire = this.getDeclaringType().(SpringBeanRefType).getSpringBean().getAutowire()
@@ -100,6 +100,9 @@ class SpringBeanXMLAutowiredSetterMethod extends Method {
   }
 }
 
+/** DEPRECATED: Alias for SpringBeanXmlAutowiredSetterMethod */
+deprecated class SpringBeanXMLAutowiredSetterMethod = SpringBeanXmlAutowiredSetterMethod;
+
 /**
  * A callable that is annotated with `@Autowired`.
  *
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll
index 17a19c9a228..6b7636203e1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll
@@ -12,7 +12,7 @@ import semmle.code.java.frameworks.spring.SpringReplacedMethod
  */
 
 /** A `<bean>` element in a Spring XML file. */
-class SpringBean extends SpringXMLElement {
+class SpringBean extends SpringXmlElement {
   SpringBean() {
     this.getName() = "bean" and
     // Do not capture Camel beans, which are different
@@ -268,7 +268,7 @@ class SpringBean extends SpringXMLElement {
   /**
    * Holds if this bean element has the same bean identifier as `other`.
    */
-  override predicate isSimilar(SpringXMLElement other) {
+  override predicate isSimilar(SpringXmlElement other) {
     this.getBeanIdentifier() = other.(SpringBean).getBeanIdentifier()
   }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll
index 3cbbf6acf11..656837e6d5e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll
@@ -9,56 +9,71 @@ import semmle.code.java.frameworks.spring.SpringBean
 /**
  * An Apache Camel element in a Spring Beans file.
  */
-class SpringCamelXMLElement extends SpringXMLElement {
-  SpringCamelXMLElement() { getNamespace().getURI() = "http://camel.apache.org/schema/spring" }
+class SpringCamelXmlElement extends SpringXmlElement {
+  SpringCamelXmlElement() { getNamespace().getURI() = "http://camel.apache.org/schema/spring" }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlElement */
+deprecated class SpringCamelXMLElement = SpringCamelXmlElement;
+
 /**
  * An element in a Spring beans file that defines an Apache Camel context.
  *
  * All Apache Camel Spring elements are nested within a `<camelContext>` or a `<routeContext>`.
  */
-class SpringCamelXMLContext extends SpringCamelXMLElement {
-  SpringCamelXMLContext() { getName() = "camelContext" }
+class SpringCamelXmlContext extends SpringCamelXmlElement {
+  SpringCamelXmlContext() { getName() = "camelContext" }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlContext */
+deprecated class SpringCamelXMLContext = SpringCamelXmlContext;
+
 /**
  * An element in a Spring beans file that defines an Apache Camel route context.
  *
  * A `<routeContext>` is a fragment, containing route definitions, that can be included within a
  * `<camelContext>`.
  */
-class SpringCamelXMLRouteContext extends SpringCamelXMLElement {
-  SpringCamelXMLRouteContext() { getName() = "routeContext" }
+class SpringCamelXmlRouteContext extends SpringCamelXmlElement {
+  SpringCamelXmlRouteContext() { getName() = "routeContext" }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlRouteContext */
+deprecated class SpringCamelXMLRouteContext = SpringCamelXmlRouteContext;
+
 /**
  * An element in a Spring beans files that defines an Apache Camel route.
  *
  * A Camel `<route>` element defines how messages that match certain criteria are handled by Apache
  * Camel.
  */
-class SpringCamelXMLRoute extends SpringCamelXMLElement {
-  SpringCamelXMLRoute() {
+class SpringCamelXmlRoute extends SpringCamelXmlElement {
+  SpringCamelXmlRoute() {
     // A route must either be in a `<routeContext>` or a `<camelContext>`.
     (
-      getParent() instanceof SpringCamelXMLRouteContext or
-      getParent() instanceof SpringCamelXMLContext
+      getParent() instanceof SpringCamelXmlRouteContext or
+      getParent() instanceof SpringCamelXmlContext
     ) and
     getName() = "route"
   }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlRoute */
+deprecated class SpringCamelXMLRoute = SpringCamelXmlRoute;
+
 /**
  * An element in a Spring bean file that is logically contained in an Apache Camel route.
  */
-class SpringCamelXMLRouteElement extends SpringCamelXMLElement {
-  SpringCamelXMLRouteElement() {
-    getParent() instanceof SpringCamelXMLRoute or
-    getParent() instanceof SpringCamelXMLRouteElement
+class SpringCamelXmlRouteElement extends SpringCamelXmlElement {
+  SpringCamelXmlRouteElement() {
+    getParent() instanceof SpringCamelXmlRoute or
+    getParent() instanceof SpringCamelXmlRouteElement
   }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlRouteElement */
+deprecated class SpringCamelXMLRouteElement = SpringCamelXmlRouteElement;
+
 /**
  * A reference to a Spring bean in an Apache Camel route defined in a Spring beans file.
  *
@@ -66,8 +81,8 @@ class SpringCamelXMLRouteElement extends SpringCamelXMLElement {
  * specifies a Spring bean that should be called in response to messages that match the enclosing
  * route.
  */
-class SpringCamelXMLBeanRef extends SpringCamelXMLRouteElement {
-  SpringCamelXMLBeanRef() { getName() = "bean" }
+class SpringCamelXmlBeanRef extends SpringCamelXmlRouteElement {
+  SpringCamelXmlBeanRef() { getName() = "bean" }
 
   /**
    * Gets the Spring bean that is referenced by this route bean definition, if any.
@@ -83,6 +98,9 @@ class SpringCamelXMLBeanRef extends SpringCamelXMLRouteElement {
   RefType getBeanType() { result.getQualifiedName() = getAttribute("beanType").getValue() }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlBeanRef */
+deprecated class SpringCamelXMLBeanRef = SpringCamelXmlBeanRef;
+
 /**
  * A declaration of a target in an Apache Camel route defined in a Spring beans file.
  *
@@ -90,8 +108,8 @@ class SpringCamelXMLBeanRef extends SpringCamelXMLRouteElement {
  * determines the type of the target. For example, if the scheme is "bean:" then the rest of the uri
  * consists of a bean name and optional method name.
  */
-class SpringCamelXMLToElement extends SpringCamelXMLRouteElement {
-  SpringCamelXMLToElement() { getName() = "to" }
+class SpringCamelXmlToElement extends SpringCamelXmlRouteElement {
+  SpringCamelXmlToElement() { getName() = "to" }
 
   /**
    * Gets the URI attribute for this `<to>` element.
@@ -99,6 +117,9 @@ class SpringCamelXMLToElement extends SpringCamelXMLRouteElement {
   string getURI() { result = getAttribute("uri").getValue() }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlToElement */
+deprecated class SpringCamelXMLToElement = SpringCamelXmlToElement;
+
 /**
  * A declaration of a Apache Camel "method" expression defined in a Spring beans file.
  *
@@ -107,8 +128,8 @@ class SpringCamelXMLToElement extends SpringCamelXMLRouteElement {
  * (when the "ref" or "bean" attributes are used), or a type that should be instantiated as a bean
  * (if "beanType" is used.
  */
-class SpringCamelXMLMethodElement extends SpringCamelXMLElement {
-  SpringCamelXMLMethodElement() { getName() = "method" }
+class SpringCamelXmlMethodElement extends SpringCamelXmlElement {
+  SpringCamelXmlMethodElement() { getName() = "method" }
 
   /**
    * Gets the `SpringBean` that this method expression refers to.
@@ -123,3 +144,6 @@ class SpringCamelXMLMethodElement extends SpringCamelXMLElement {
    */
   RefType getBeanType() { result.getQualifiedName() = getAttribute("beanType").getValue() }
 }
+
+/** DEPRECATED: Alias for SpringCamelXmlMethodElement */
+deprecated class SpringCamelXMLMethodElement = SpringCamelXmlMethodElement;
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll
index b2b507414d1..1c037adefd6 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll
@@ -8,8 +8,8 @@ import semmle.code.xml.WebXML
  * An element in a Spring configuration file that configures which packages are considered to be
  * "base" packages when performing the Spring component scan.
  */
-class SpringXMLComponentScan extends SpringXMLElement {
-  SpringXMLComponentScan() {
+class SpringXmlComponentScan extends SpringXmlElement {
+  SpringXmlComponentScan() {
     this.getName() = "component-scan" and
     this.getNamespace().getPrefix() = "context"
   }
@@ -23,6 +23,9 @@ class SpringXMLComponentScan extends SpringXMLElement {
   string getAProfileExpr() { result = this.getSpringBeanFile().getAProfileExpr() }
 }
 
+/** DEPRECATED: Alias for SpringXmlComponentScan */
+deprecated class SpringXMLComponentScan = SpringXmlComponentScan;
+
 /**
  * An annotation of a class that configures which packages are considered to be "base" packages
  * when performing the Spring component scan.
@@ -59,11 +62,11 @@ class SpringBasePackage extends string {
     exists(string basePackages |
       // Interpret the contexts of the `web.xml` "contextConfigLocation" parameter as a base package,
       // but only if the appropriate context class is chosen.
-      exists(WebXMLFile webXML |
-        webXML.getContextParamValue("contextClass") =
+      exists(WebXmlFile webXml |
+        webXml.getContextParamValue("contextClass") =
           "org.springframework.web.context.support.AnnotationConfigWebApplicationContext"
       |
-        basePackages = webXML.getContextParamValue("contextConfigLocation")
+        basePackages = webXml.getContextParamValue("contextConfigLocation")
       )
       or
       exists(SpringComponent c, Annotation componentScan |
@@ -75,7 +78,7 @@ class SpringBasePackage extends string {
         c.isLive()
       )
       or
-      exists(SpringXMLComponentScan xmlComponentScan |
+      exists(SpringXmlComponentScan xmlComponentScan |
         basePackages = xmlComponentScan.getBasePackages() and
         // The component scan profile must be active, if one is specified.
         (
@@ -110,7 +113,7 @@ class SpringComponentAnnotation extends AnnotationType {
  * In order for Spring XML to be "enabled", XML must have been indexed into the snapshot, and that
  * XML must contain the appropriate Spring configuration files.
  */
-private predicate isSpringXMLEnabled() { exists(SpringXMLElement springXMLElement) }
+private predicate isSpringXmlEnabled() { exists(SpringXmlElement springXmlElement) }
 
 /**
  * A Spring component class, identified by the presence of a particular annotation.
@@ -178,7 +181,7 @@ class SpringComponent extends RefType {
     // only validate whether this class is ever picked up if XML indexing is enabled. If it's
     // enabled, then the package of this class must belong in one of the packages defined as a base
     // package.
-    not isSpringXMLEnabled()
+    not isSpringXmlEnabled()
     or
     exists(SpringBasePackage sbp |
       this.getPackage().getName().prefix(sbp.length() + 1) = sbp + "." or
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll
index d9762d792f9..e434e53ca3d 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll
@@ -5,7 +5,7 @@ import semmle.code.java.frameworks.spring.SpringAbstractRef
 import semmle.code.java.frameworks.spring.SpringValue
 
 /** A `<constructor-arg>` element in a Spring XML file. */
-class SpringConstructorArg extends SpringXMLElement {
+class SpringConstructorArg extends SpringXmlElement {
   SpringConstructorArg() { this.getName() = "constructor-arg" }
 
   /** Holds if this `constructor-arg` element has an `index` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll
index a6a803a6275..34cf13a9571 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll
@@ -6,6 +6,6 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
  *
  * Its contents can be accessed using `SpringXMLElement.getContentString()`.
  */
-class SpringDescription extends SpringXMLElement {
+class SpringDescription extends SpringXmlElement {
   SpringDescription() { this.getName() = "description" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll
index 128d1abd548..8ec02002af5 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll
@@ -6,7 +6,7 @@ import semmle.code.java.frameworks.spring.SpringKey
 import semmle.code.java.frameworks.spring.SpringValue
 
 /** An `<entry>` element in Spring XML files. */
-class SpringEntry extends SpringXMLElement {
+class SpringEntry extends SpringXmlElement {
   SpringEntry() { this.getName() = "entry" }
 
   /** Holds if this `entry` has a `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll
index 7ed0f78fd37..0d18749a63e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll
@@ -9,7 +9,7 @@ import semmle.code.java.frameworks.spring.SpringComponentScan
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** Represents a `<remoting-destination>` element in Spring XML files. */
-class SpringRemotingDestination extends SpringXMLElement {
+class SpringRemotingDestination extends SpringXmlElement {
   SpringRemotingDestination() { this.getName() = "remoting-destination" }
 
   /**
@@ -55,7 +55,12 @@ class SpringRemotingDestinationClass extends Class {
   /**
    * Gets the XML configuration of the remoting destination, if it was configured in XML.
    */
-  SpringRemotingDestination getRemotingDestinationXML() { this = result.getSpringBean().getClass() }
+  SpringRemotingDestination getRemotingDestinationXml() { this = result.getSpringBean().getClass() }
+
+  /** DEPRECATED: Alias for getRemotingDestinationXml */
+  deprecated SpringRemotingDestination getRemotingDestinationXML() {
+    result = this.getRemotingDestinationXml()
+  }
 
   /**
    * Holds if the class is operating on an "include" or "exclude" basis.
@@ -70,7 +75,7 @@ class SpringRemotingDestinationClass extends Class {
       m.hasAnnotation("org.springframework.flex.remoting", "RemotingInclude")
     )
     or
-    exists(this.getRemotingDestinationXML().getAnIncludeMethod())
+    exists(this.getRemotingDestinationXml().getAnIncludeMethod())
   }
 
   /**
@@ -81,10 +86,10 @@ class SpringRemotingDestinationClass extends Class {
     if this.isIncluding()
     then
       result.hasAnnotation("org.springframework.flex.remoting", "RemotingInclude") or
-      result.getName() = this.getRemotingDestinationXML().getAnIncludeMethod()
+      result.getName() = this.getRemotingDestinationXml().getAnIncludeMethod()
     else (
       not result.hasAnnotation("org.springframework.flex.remoting", "RemotingExclude") and
-      not result.getName() = this.getRemotingDestinationXML().getAnExcludeMethod()
+      not result.getName() = this.getRemotingDestinationXml().getAnExcludeMethod()
     )
   }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll
index 72290764540..688a14da32e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** An `<import>` element in a Spring XML file. */
-class SpringImport extends SpringXMLElement {
+class SpringImport extends SpringXmlElement {
   SpringImport() { this.getName() = "import" }
 
   /** Gets the value of the `resource` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll
index 1b993b6bf9d..5f07b227706 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll
@@ -2,6 +2,6 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<key>` element in Spring XML files. */
-class SpringKey extends SpringXMLElement {
+class SpringKey extends SpringXmlElement {
   SpringKey() { this.getName() = "key" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll
index 81ef06c14c5..9dba22a3cb7 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A `<lookup-method>` element in a Spring XML file. */
-class SpringLookupMethod extends SpringXMLElement {
+class SpringLookupMethod extends SpringXmlElement {
   SpringLookupMethod() { this.getName() = "lookup-method" }
 
   /** Gets the value of the `bean` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll
index 2898a1d1e70..baef7d3b91a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll
@@ -4,7 +4,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 /**
  * A common superclass for mergeable Spring XML elements (`list`, `map`).
  */
-/*abstract*/ class SpringMergable extends SpringXMLElement {
+/*abstract*/ class SpringMergable extends SpringXmlElement {
   string getMergeRaw() { result = this.getAttributeValueWithDefault("merge") }
 
   /** Holds if this element is merged, taking `default-merged` values in `<beans>` into account. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll
index 6e42dad820e..640305b313a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<meta>` element in Spring XML files. */
-class SpringMeta extends SpringXMLElement {
+class SpringMeta extends SpringXmlElement {
   SpringMeta() { this.getName() = "meta" }
 
   /** Gets the value of the `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll
index b46a888b4e0..c3f2c00a2b7 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll
@@ -2,6 +2,6 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<null>` element in Spring XML files. */
-class SpringNull extends SpringXMLElement {
+class SpringNull extends SpringXmlElement {
   SpringNull() { this.getName() = "null" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll
index fb4964e4b61..771370a3e7a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<prop>` element in Spring XML files. */
-class SpringProp extends SpringXMLElement {
+class SpringProp extends SpringXmlElement {
   SpringProp() { this.getName() = "prop" }
 
   /** Gets the value of the `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll
index cdf6a1f9bd0..06d5daefaa1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll
@@ -6,7 +6,7 @@ import semmle.code.java.frameworks.spring.SpringList
 import semmle.code.java.frameworks.spring.SpringValue
 
 /** A `<property>` element in Spring XML files. */
-class SpringProperty extends SpringXMLElement {
+class SpringProperty extends SpringXmlElement {
   SpringProperty() { this.getName() = "property" }
 
   override string toString() { result = this.getPropertyName() }
@@ -55,7 +55,7 @@ class SpringProperty extends SpringXMLElement {
    * Holds if this property is similar to another property.
    * Currently only checks the property name and references to beans.
    */
-  override predicate isSimilar(SpringXMLElement element) {
+  override predicate isSimilar(SpringXmlElement element) {
     exists(SpringProperty other |
       other = element and this.getPropertyName() = other.getPropertyName()
     |
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll
index 3ac11e9e5f3..eb57b37efe0 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<qualifier>` element in a Spring XML file. */
-class SpringQualifier extends SpringXMLElement {
+class SpringQualifier extends SpringXmlElement {
   SpringQualifier() { this.getName() = "qualifier" }
 
   /** Gets the name of the Java class of this qualifier. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll
index ae2e827e703..47e8d182898 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A `<replaced-method>` element in a Spring XML file. */
-class SpringReplacedMethod extends SpringXMLElement {
+class SpringReplacedMethod extends SpringXmlElement {
   SpringReplacedMethod() { this.getName() = "replaced-method" }
 
   /** Gets the value of the `name` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll
index 73c4098a8c2..55854d60f9c 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<value>` element in a Spring XML file. */
-class SpringValue extends SpringXMLElement {
+class SpringValue extends SpringXmlElement {
   SpringValue() { this.getName() = "value" }
 
   /** Gets the value of the `type` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll
index 943285d99a8..adaf69c5890 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll
@@ -3,11 +3,11 @@ import semmle.code.java.frameworks.spring.SpringBeanFile
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A common superclass for all Spring XML elements. */
-class SpringXMLElement extends XMLElement {
-  SpringXMLElement() { this.getFile() instanceof SpringBeanFile }
+class SpringXmlElement extends XMLElement {
+  SpringXmlElement() { this.getFile() instanceof SpringBeanFile }
 
   /** Gets a child of this Spring XML element. */
-  SpringXMLElement getASpringChild() { result = this.getAChild() }
+  SpringXmlElement getASpringChild() { result = this.getAChild() }
 
   /** Gets the bean file of this XML element. */
   SpringBeanFile getSpringBeanFile() { result = this.getFile() }
@@ -27,13 +27,16 @@ class SpringXMLElement extends XMLElement {
   SpringBean getEnclosingBean() {
     if this instanceof SpringBean
     then result = this
-    else result = this.getParent().(SpringXMLElement).getEnclosingBean()
+    else result = this.getParent().(SpringXmlElement).getEnclosingBean()
   }
 
   /**
    * Overridden by subclasses. Used to match `value`, `property` and `ref` elements for similarity.
    */
-  predicate isSimilar(SpringXMLElement other) { none() }
+  predicate isSimilar(SpringXmlElement other) { none() }
 
   string getContentString() { result = this.allCharactersString() }
 }
+
+/** DEPRECATED: Alias for SpringXmlElement */
+deprecated class SpringXMLElement = SpringXmlElement;
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll
index 9cac47fa281..ffbc5c9e5ec 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll
@@ -2,7 +2,7 @@ import semmle.code.java.frameworks.spring.SpringBean
 import semmle.code.java.frameworks.spring.SpringBeanFile
 import semmle.code.java.frameworks.spring.SpringEntry
 
-predicate springDepends(SpringBean b1, SpringBean b2, SpringXMLElement cause) {
+predicate springDepends(SpringBean b1, SpringBean b2, SpringXmlElement cause) {
   b1 != b2 and
   b1.getBeanParent() = b2 and
   cause = b1
@@ -63,7 +63,7 @@ class MetricSpringBean extends SpringBean {
     this.getSpringBeanFile() = result.getSpringBeanFile()
   }
 
-  SpringXMLElement getBeanDependencyCause(SpringBean dependency) {
+  SpringXmlElement getBeanDependencyCause(SpringBean dependency) {
     springDepends(this, dependency, result)
   }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
index ebe6716e4f5..4d50dbf92ab 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
@@ -6,7 +6,7 @@ import semmle.code.java.frameworks.struts.StrutsXML
  * Gets the custom struts mapper class used for this `refType`, if any.
  */
 private string getStrutsMapperClass(RefType refType) {
-  result = getRootXMLFile(refType).getConstantValue("struts.mapper.class")
+  result = getRootXmlFile(refType).getConstantValue("struts.mapper.class")
 }
 
 /**
@@ -21,7 +21,7 @@ class Struts2ActionClass extends Class {
     or
     // If there is a struts.xml file, then any class that is specified as an action is considered
     // to be reflectively constructed.
-    exists(StrutsXMLAction strutsAction | this = strutsAction.getActionClass())
+    exists(StrutsXmlAction strutsAction | this = strutsAction.getActionClass())
     or
     // We have determined that this is an action class due to the conventions plugin.
     this instanceof Struts2ConventionActionClass
@@ -64,7 +64,7 @@ class Struts2ActionClass extends Class {
           any()
         else (
           // Use the default mapping
-          exists(StrutsXMLAction strutsAction |
+          exists(StrutsXmlAction strutsAction |
             this = strutsAction.getActionClass() and
             result = strutsAction.getActionMethod()
           )
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
index 0f38147ad13..fd9f14d4c6f 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
@@ -53,7 +53,7 @@ private predicate isStrutsConventionPluginUsed(RefType refType) {
   strutsConventionAnnotationUsedInFolder(getSourceFolder(refType.getCompilationUnit()))
   or
   // The struts configuration file for this file sets a convention property
-  getRootXMLFile(refType).getAConstant().getName().matches("struts.convention%")
+  getRootXmlFile(refType).getAConstant().getName().matches("struts.convention%")
   or
   // We've found the POM for this RefType, and it includes a dependency on the convention plugin
   exists(Pom pom |
@@ -68,7 +68,7 @@ private predicate isStrutsConventionPluginUsed(RefType refType) {
  * We guess by identifying the "nearest" `struts.xml` configuration file, i.e. the Struts
  * configuration file with the lowest common ancestor to this file.
  */
-StrutsXMLFile getRootXMLFile(RefType refType) {
+StrutsXmlFile getRootXmlFile(RefType refType) {
   exists(StrutsFolder strutsFolder |
     strutsFolder = refType.getFile().getParentContainer*() and
     strutsFolder.isUnique()
@@ -77,14 +77,17 @@ StrutsXMLFile getRootXMLFile(RefType refType) {
   )
 }
 
+/** DEPRECATED: Alias for getRootXmlFile */
+deprecated StrutsXMLFile getRootXMLFile(RefType refType) { result = getRootXmlFile(refType) }
+
 /**
  * Gets the suffix used for automatically identifying actions when using the convention plugin.
  *
  * If no configuration is supplied, or identified, the default is "Action".
  */
 private string getConventionSuffix(RefType refType) {
-  if exists(getRootXMLFile(refType).getConstantValue("struts.convention.action.suffix"))
-  then result = getRootXMLFile(refType).getConstantValue("struts.convention.action.suffix")
+  if exists(getRootXmlFile(refType).getConstantValue("struts.convention.action.suffix"))
+  then result = getRootXmlFile(refType).getConstantValue("struts.convention.action.suffix")
   else result = "Action"
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
index 8e69c5d9a83..77285d98175 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
@@ -4,13 +4,16 @@ import semmle.code.xml.XML
 /**
  * Holds if any struts XML files are included in this snapshot.
  */
-predicate isStrutsXMLIncluded() { exists(StrutsXMLFile strutsXML) }
+predicate isStrutsXmlIncluded() { exists(StrutsXmlFile strutsXml) }
+
+/** DEPRECATED: Alias for isStrutsXmlIncluded */
+deprecated predicate isStrutsXMLIncluded = isStrutsXmlIncluded/0;
 
 /**
  * A struts 2 configuration file.
  */
-abstract class StrutsXMLFile extends XMLFile {
-  StrutsXMLFile() {
+abstract class StrutsXmlFile extends XMLFile {
+  StrutsXmlFile() {
     // Contains a single top-level XML node named "struts".
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "struts"
@@ -19,55 +22,64 @@ abstract class StrutsXMLFile extends XMLFile {
   /**
    * Gets a "root" struts configuration file that includes this file.
    */
-  StrutsRootXMLFile getARoot() { result.getAnIncludedFile() = this }
+  StrutsRootXmlFile getARoot() { result.getAnIncludedFile() = this }
 
   /**
    * Gets a directly included file.
    */
-  StrutsXMLFile getADirectlyIncludedFile() {
-    exists(StrutsXMLInclude include | include.getFile() = this | result = include.getIncludedFile())
+  StrutsXmlFile getADirectlyIncludedFile() {
+    exists(StrutsXmlInclude include | include.getFile() = this | result = include.getIncludedFile())
   }
 
   /**
    * Gets a transitively included file.
    */
-  StrutsXMLFile getAnIncludedFile() { result = this.getADirectlyIncludedFile*() }
+  StrutsXmlFile getAnIncludedFile() { result = this.getADirectlyIncludedFile*() }
 
   /**
    * Gets a `<constant>` defined in this file, or an included file.
    */
-  StrutsXMLConstant getAConstant() { result.getFile() = this.getAnIncludedFile() }
+  StrutsXmlConstant getAConstant() { result.getFile() = this.getAnIncludedFile() }
 
   /**
    * Gets the value of the constant with the given `name`.
    */
   string getConstantValue(string name) {
-    exists(StrutsXMLConstant constant | constant = this.getAConstant() |
+    exists(StrutsXmlConstant constant | constant = this.getAConstant() |
       constant.getConstantName() = name and
       result = constant.getConstantValue()
     )
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlFile */
+deprecated class StrutsXMLFile = StrutsXmlFile;
+
 /**
  * A Struts 2 "root" configuration XML file directly read by struts.
  *
  * Root configurations either have the name `struts.xml` or `struts-plugin.xml`.
  */
-class StrutsRootXMLFile extends StrutsXMLFile {
-  StrutsRootXMLFile() {
+class StrutsRootXmlFile extends StrutsXmlFile {
+  StrutsRootXmlFile() {
     this.getBaseName() = "struts.xml" or
     this.getBaseName() = "struts-plugin.xml"
   }
 }
 
+/** DEPRECATED: Alias for StrutsRootXmlFile */
+deprecated class StrutsRootXMLFile = StrutsRootXmlFile;
+
 /**
  * A Struts 2 configuration XML file included, directly or indirectly, by a root Struts configuration.
  */
-class StrutsIncludedXMLFile extends StrutsXMLFile {
-  StrutsIncludedXMLFile() { exists(StrutsXMLInclude include | this = include.getIncludedFile()) }
+class StrutsIncludedXmlFile extends StrutsXmlFile {
+  StrutsIncludedXmlFile() { exists(StrutsXmlInclude include | this = include.getIncludedFile()) }
 }
 
+/** DEPRECATED: Alias for StrutsIncludedXmlFile */
+deprecated class StrutsIncludedXMLFile = StrutsIncludedXmlFile;
+
 /**
  * A Folder which has one or more Struts 2 root configurations.
  */
@@ -75,7 +87,7 @@ class StrutsFolder extends Folder {
   StrutsFolder() {
     exists(Container c | c = this.getAChildContainer() |
       c instanceof StrutsFolder or
-      c instanceof StrutsXMLFile
+      c instanceof StrutsXmlFile
     )
   }
 
@@ -87,7 +99,7 @@ class StrutsFolder extends Folder {
   /**
    * Gets a struts root configuration that applies to this folder.
    */
-  StrutsRootXMLFile getAStrutsRootFile() {
+  StrutsRootXmlFile getAStrutsRootFile() {
     result = this.getAChildContainer() or
     result = this.getAChildContainer().(StrutsFolder).getAStrutsRootFile()
   }
@@ -96,8 +108,8 @@ class StrutsFolder extends Folder {
 /**
  * An XML element in a `StrutsXMLFile`.
  */
-class StrutsXMLElement extends XMLElement {
-  StrutsXMLElement() { this.getFile() instanceof StrutsXMLFile }
+class StrutsXmlElement extends XMLElement {
+  StrutsXmlElement() { this.getFile() instanceof StrutsXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -105,14 +117,17 @@ class StrutsXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for StrutsXmlElement */
+deprecated class StrutsXMLElement = StrutsXmlElement;
+
 /**
  * A `<include>` element within a `struts.xml` file.
  *
  * This indicates that the file specified in the `file` attribute should be included in the struts
  * configuration. The file is looked up using the classpath.
  */
-class StrutsXMLInclude extends StrutsXMLElement {
-  StrutsXMLInclude() { this.getName() = "include" }
+class StrutsXmlInclude extends StrutsXmlElement {
+  StrutsXmlInclude() { this.getName() = "include" }
 
   /**
    * Gets the XMLFile that we believe is included by this include statement.
@@ -127,6 +142,9 @@ class StrutsXMLInclude extends StrutsXMLElement {
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlInclude */
+deprecated class StrutsXMLInclude = StrutsXmlInclude;
+
 /**
  * Escape a string for use as the matcher in a string.match(..) call.
  */
@@ -150,8 +168,8 @@ private predicate strutsWildcardMatching(string matches, string wildcardstring)
 /**
  * A `<action>` element within a `struts.xml` file.
  */
-class StrutsXMLAction extends StrutsXMLElement {
-  StrutsXMLAction() { this.getName() = "action" }
+class StrutsXmlAction extends StrutsXmlElement {
+  StrutsXmlAction() { this.getName() = "action" }
 
   /**
    * Gets the `Class` that is referenced by this Struts action.
@@ -175,13 +193,19 @@ class StrutsXMLAction extends StrutsXMLElement {
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlAction */
+deprecated class StrutsXMLAction = StrutsXmlAction;
+
 /**
  * A `<constant>` property, representing a configuration parameter to struts.
  */
-class StrutsXMLConstant extends StrutsXMLElement {
-  StrutsXMLConstant() { this.getName() = "constant" }
+class StrutsXmlConstant extends StrutsXmlElement {
+  StrutsXmlConstant() { this.getName() = "constant" }
 
   string getConstantName() { result = this.getAttribute("name").getValue() }
 
   string getConstantValue() { result = this.getAttribute("value").getValue() }
 }
+
+/** DEPRECATED: Alias for StrutsXmlConstant */
+deprecated class StrutsXMLConstant = StrutsXmlConstant;
diff --git a/java/ql/lib/semmle/code/java/security/Encryption.qll b/java/ql/lib/semmle/code/java/security/Encryption.qll
index e87ecd13043..218539418b0 100644
--- a/java/ql/lib/semmle/code/java/security/Encryption.qll
+++ b/java/ql/lib/semmle/code/java/security/Encryption.qll
@@ -17,10 +17,14 @@ class X509TrustManager extends RefType {
   X509TrustManager() { this.hasQualifiedName("javax.net.ssl", "X509TrustManager") }
 }
 
-class HttpsURLConnection extends RefType {
-  HttpsURLConnection() { this.hasQualifiedName("javax.net.ssl", "HttpsURLConnection") }
+/** The `javax.net.ssl.HttpsURLConnection` class. */
+class HttpsUrlConnection extends RefType {
+  HttpsUrlConnection() { this.hasQualifiedName("javax.net.ssl", "HttpsURLConnection") }
 }
 
+/** DEPRECATED: Alias for HttpsUrlConnection */
+deprecated class HttpsURLConnection = HttpsUrlConnection;
+
 class SSLSocketFactory extends RefType {
   SSLSocketFactory() { this.hasQualifiedName("javax.net.ssl", "SSLSocketFactory") }
 }
@@ -105,22 +109,22 @@ class CreateSslEngineMethod extends Method {
 class SetConnectionFactoryMethod extends Method {
   SetConnectionFactoryMethod() {
     this.hasName("setSSLSocketFactory") and
-    this.getDeclaringType().getAnAncestor() instanceof HttpsURLConnection
+    this.getDeclaringType().getAnAncestor() instanceof HttpsUrlConnection
   }
 }
 
 class SetHostnameVerifierMethod extends Method {
   SetHostnameVerifierMethod() {
     this.hasName("setHostnameVerifier") and
-    this.getDeclaringType().getAnAncestor() instanceof HttpsURLConnection
+    this.getDeclaringType().getAnAncestor() instanceof HttpsUrlConnection
   }
 }
 
-/** The `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsURLConnection`. */
+/** The `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsUrlConnection`. */
 class SetDefaultHostnameVerifierMethod extends Method {
   SetDefaultHostnameVerifierMethod() {
     this.hasName("setDefaultHostnameVerifier") and
-    this.getDeclaringType().getAnAncestor() instanceof HttpsURLConnection
+    this.getDeclaringType().getAnAncestor() instanceof HttpsUrlConnection
   }
 }
 
@@ -244,34 +248,6 @@ string getSecureAlgorithmRegex() {
   result = algorithmRegex(secureAlgorithmString(max(int i | exists(rankedSecureAlgorithm(i)))))
 }
 
-/**
- * DEPRECATED: Terminology has been updated. Use `getAnInsecureAlgorithmName()`
- * instead.
- */
-deprecated string algorithmBlacklist() { result = getAnInsecureAlgorithmName() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use
- * `getAnInsecureHashAlgorithmName()` instead.
- */
-deprecated string hashAlgorithmBlacklist() { result = getAnInsecureHashAlgorithmName() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getInsecureAlgorithmRegex()` instead.
- */
-deprecated string algorithmBlacklistRegex() { result = getInsecureAlgorithmRegex() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getASecureAlgorithmName()`
- * instead.
- */
-deprecated string algorithmWhitelist() { result = getASecureAlgorithmName() }
-
-/**
- * DEPRECATED: Terminology has been updated. Use `getSecureAlgorithmRegex()` instead.
- */
-deprecated string algorithmWhitelistRegex() { result = getSecureAlgorithmRegex() }
-
 /**
  * Any use of a cryptographic element that specifies an encryption
  * algorithm. For example, methods returning ciphers, decryption methods,
diff --git a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
index 0aee4aaf802..b4b8ea7fdd9 100644
--- a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
@@ -10,11 +10,14 @@ import semmle.code.java.dataflow.TaintTracking
 /**
  * A `Method` that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPIMethod extends Method { }
+abstract class SafeExternalApiMethod extends Method { }
+
+/** DEPRECATED: Alias for SafeExternalApiMethod */
+deprecated class SafeExternalAPIMethod = SafeExternalApiMethod;
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPIMethod extends SafeExternalAPIMethod {
-  DefaultSafeExternalAPIMethod() {
+private class DefaultSafeExternalApiMethod extends SafeExternalApiMethod {
+  DefaultSafeExternalApiMethod() {
     this instanceof EqualsMethod
     or
     this.getName().regexpMatch("size|length|compareTo|getClass|lastIndexOf")
@@ -53,11 +56,11 @@ private class DefaultSafeExternalAPIMethod extends SafeExternalAPIMethod {
 }
 
 /** A node representing data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     (
       // Argument to call to a method
       this.asExpr() = call.getArgument(i)
@@ -79,7 +82,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
     not exists(DataFlow::Node next | TaintTracking::localTaintStep(this, next)) and
     not exists(DataFlow::Node next | TaintTracking::defaultAdditionalTaintStep(this, next)) and
     // Not a call to a known safe external API
-    not call.getCallee() instanceof SafeExternalAPIMethod
+    not call.getCallee() instanceof SafeExternalApiMethod
   }
 
   /** Gets the called API `Method`. */
@@ -95,38 +98,47 @@ class ExternalAPIDataNode extends DataFlow::Node {
   }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
+
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Method m, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Method m, int index) {
+    exists(UntrustedExternalApiDataNode n |
       m = n.getMethod() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getMethod(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getMethod(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -139,9 +151,12 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Method m, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(m, index) and
+      this = TExternalApiParameter(m, index) and
       result =
         m.getDeclaringType().getQualifiedName() + "." + m.getSignature() + " [" + indexString + "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
index 836b0dec30f..6a400d479a6 100644
--- a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
@@ -29,7 +29,7 @@ class ImplicitPendingIntentStartConf extends TaintTracking::Configuration {
     any(ImplicitPendingIntentAdditionalTaintStep c).step(node1, node2)
   }
 
-  override predicate isAdditionalFlowStep(
+  override predicate isAdditionalTaintStep(
     DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
     DataFlow::FlowState state2
   ) {
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgery.qll b/java/ql/lib/semmle/code/java/security/RequestForgery.qll
index b7d3e4a8a77..e6efc13c8a5 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgery.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgery.qll
@@ -7,6 +7,7 @@ import semmle.code.java.frameworks.spring.Spring
 import semmle.code.java.frameworks.JaxWS
 import semmle.code.java.frameworks.javase.Http
 import semmle.code.java.dataflow.DataFlow
+import semmle.code.java.frameworks.Properties
 private import semmle.code.java.dataflow.StringPrefixes
 private import semmle.code.java.dataflow.ExternalFlow
 
@@ -33,6 +34,20 @@ private class DefaultRequestForgeryAdditionalTaintStep extends RequestForgeryAdd
   }
 }
 
+private class TypePropertiesRequestForgeryAdditionalTaintStep extends RequestForgeryAdditionalTaintStep {
+  override predicate propagatesTaint(DataFlow::Node pred, DataFlow::Node succ) {
+    exists(MethodAccess ma |
+      // Properties props = new Properties();
+      // props.setProperty("jdbcUrl", tainted);
+      // Propagate tainted value to the qualifier `props`
+      ma.getMethod() instanceof PropertiesSetPropertyMethod and
+      ma.getArgument(0).(CompileTimeConstantExpr).getStringValue() = "jdbcUrl" and
+      pred.asExpr() = ma.getArgument(1) and
+      succ.asExpr() = ma.getQualifier()
+    )
+  }
+}
+
 /** A data flow sink for server-side request forgery (SSRF) vulnerabilities. */
 abstract class RequestForgerySink extends DataFlow::Node { }
 
@@ -40,6 +55,10 @@ private class UrlOpenSinkAsRequestForgerySink extends RequestForgerySink {
   UrlOpenSinkAsRequestForgerySink() { sinkNode(this, "open-url") }
 }
 
+private class JdbcUrlSinkAsRequestForgerySink extends RequestForgerySink {
+  JdbcUrlSinkAsRequestForgerySink() { sinkNode(this, "jdbc-url") }
+}
+
 /** A sanitizer for request forgery vulnerabilities. */
 abstract class RequestForgerySanitizer extends DataFlow::Node { }
 
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
index c93d3089dc9..c8a59f65b0e 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
@@ -18,7 +18,7 @@ class RequestForgeryConfiguration extends TaintTracking::Configuration {
     // Exclude results of remote HTTP requests: fetching something else based on that result
     // is no worse than following a redirect returned by the remote server, and typically
     // we're requesting a resource via https which we trust to only send us to safe URLs.
-    not source.asExpr().(MethodAccess).getCallee() instanceof URLConnectionGetInputStreamMethod
+    not source.asExpr().(MethodAccess).getCallee() instanceof UrlConnectionGetInputStreamMethod
   }
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof RequestForgerySink }
diff --git a/java/ql/lib/semmle/code/java/security/SensitiveLoggingQuery.qll b/java/ql/lib/semmle/code/java/security/SensitiveLoggingQuery.qll
new file mode 100644
index 00000000000..df0db54f159
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/SensitiveLoggingQuery.qll
@@ -0,0 +1,26 @@
+/** Provides configurations for sensitive logging queries. */
+
+import java
+import semmle.code.java.dataflow.ExternalFlow
+import semmle.code.java.dataflow.TaintTracking
+import semmle.code.java.security.SensitiveActions
+import DataFlow
+
+/** A variable that may hold sensitive information, judging by its name. * */
+class CredentialExpr extends Expr {
+  CredentialExpr() {
+    exists(Variable v | this = v.getAnAccess() |
+      v.getName().regexpMatch([getCommonSensitiveInfoRegex(), "(?i).*(username).*"]) and
+      not v.isFinal()
+    )
+  }
+}
+
+/** A data-flow configuration for identifying potentially-sensitive data flowing to a log output. */
+class SensitiveLoggerConfiguration extends TaintTracking::Configuration {
+  SensitiveLoggerConfiguration() { this = "SensitiveLoggerConfiguration" }
+
+  override predicate isSource(DataFlow::Node source) { source.asExpr() instanceof CredentialExpr }
+
+  override predicate isSink(DataFlow::Node sink) { sinkNode(sink, "logging") }
+}
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index 71a2492c70c..6d0ff888d82 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -28,8 +28,8 @@ private class ObjectInputStreamReadObjectMethod extends Method {
   }
 }
 
-private class XMLDecoderReadObjectMethod extends Method {
-  XMLDecoderReadObjectMethod() {
+private class XmlDecoderReadObjectMethod extends Method {
+  XmlDecoderReadObjectMethod() {
     this.getDeclaringType().hasQualifiedName("java.beans", "XMLDecoder") and
     this.hasName("readObject")
   }
@@ -140,7 +140,7 @@ predicate unsafeDeserialization(MethodAccess ma, Expr sink) {
           .hasQualifiedName("org.apache.commons.io.serialization", "ValidatingObjectInputStream")
     )
     or
-    m instanceof XMLDecoderReadObjectMethod and
+    m instanceof XmlDecoderReadObjectMethod and
     sink = ma.getQualifier()
     or
     m instanceof XStreamReadObjectMethod and
diff --git a/java/ql/lib/semmle/code/java/security/XSS.qll b/java/ql/lib/semmle/code/java/security/XSS.qll
index 6053e3f4511..23bda5b9964 100644
--- a/java/ql/lib/semmle/code/java/security/XSS.qll
+++ b/java/ql/lib/semmle/code/java/security/XSS.qll
@@ -50,8 +50,8 @@ private class DefaultXssSink extends XssSink {
 }
 
 /** A default sanitizer that considers numeric and boolean typed data safe for writing to output. */
-private class DefaultXSSSanitizer extends XssSanitizer {
-  DefaultXSSSanitizer() {
+private class DefaultXssSanitizer extends XssSanitizer {
+  DefaultXssSanitizer() {
     this.getType() instanceof NumericType or
     this.getType() instanceof BooleanType or
     // Match `org.springframework.web.util.HtmlUtils.htmlEscape` and possibly other methods like it.
diff --git a/java/ql/lib/semmle/code/java/security/XmlParsers.qll b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
index 376e7481590..0e925e435ba 100644
--- a/java/ql/lib/semmle/code/java/security/XmlParsers.qll
+++ b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
@@ -358,21 +358,24 @@ class SafeXmlInputFactory extends VarAccess {
 /**
  * The class `org.jdom.input.SAXBuilder.`
  */
-class SAXBuilder extends RefType {
-  SAXBuilder() {
+class SaxBuilder extends RefType {
+  SaxBuilder() {
     this.hasQualifiedName("org.jdom.input", "SAXBuilder") or
     this.hasQualifiedName("org.jdom2.input", "SAXBuilder")
   }
 }
 
+/** DEPRECATED: Alias for SaxBuilder */
+deprecated class SAXBuilder = SaxBuilder;
+
 /**
  * A call to `SAXBuilder.build.`
  */
-class SAXBuilderParse extends XmlParserCall {
-  SAXBuilderParse() {
+class SaxBuilderParse extends XmlParserCall {
+  SaxBuilderParse() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXBuilder and
+      m.getDeclaringType() instanceof SaxBuilder and
       m.hasName("build")
     )
   }
@@ -380,19 +383,22 @@ class SAXBuilderParse extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(SafeSAXBuilderToSAXBuilderParseFlowConfig conf | conf.hasFlowToExpr(this.getQualifier()))
+    exists(SafeSaxBuilderToSaxBuilderParseFlowConfig conf | conf.hasFlowToExpr(this.getQualifier()))
   }
 }
 
-private class SafeSAXBuilderToSAXBuilderParseFlowConfig extends DataFlow2::Configuration {
-  SafeSAXBuilderToSAXBuilderParseFlowConfig() {
+/** DEPRECATED: Alias for SaxBuilderParse */
+deprecated class SAXBuilderParse = SaxBuilderParse;
+
+private class SafeSaxBuilderToSaxBuilderParseFlowConfig extends DataFlow2::Configuration {
+  SafeSaxBuilderToSaxBuilderParseFlowConfig() {
     this = "XmlParsers::SafeSAXBuilderToSAXBuilderParseFlowConfig"
   }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXBuilder }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxBuilder }
 
   override predicate isSink(DataFlow::Node sink) {
-    sink.asExpr() = any(SAXBuilderParse sax).getQualifier()
+    sink.asExpr() = any(SaxBuilderParse sax).getQualifier()
   }
 
   override int fieldFlowBranchLimit() { result = 0 }
@@ -401,22 +407,25 @@ private class SafeSAXBuilderToSAXBuilderParseFlowConfig extends DataFlow2::Confi
 /**
  * A `ParserConfig` specific to `SAXBuilder`.
  */
-class SAXBuilderConfig extends ParserConfig {
-  SAXBuilderConfig() {
+class SaxBuilderConfig extends ParserConfig {
+  SaxBuilderConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXBuilder and
+      m.getDeclaringType() instanceof SaxBuilder and
       m.hasName("setFeature")
     )
   }
 }
 
-/** A safely configured `SAXBuilder`. */
-class SafeSAXBuilder extends VarAccess {
-  SafeSAXBuilder() {
+/** DEPRECATED: Alias for SaxBuilderConfig */
+deprecated class SAXBuilderConfig = SaxBuilderConfig;
+
+/** A safely configured `SaxBuilder`. */
+class SafeSaxBuilder extends VarAccess {
+  SafeSaxBuilder() {
     exists(Variable v |
       v = this.getVariable() and
-      exists(SAXBuilderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxBuilderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .enables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://apache.org/xml/features/disallow-doctype-decl"
@@ -426,6 +435,9 @@ class SafeSAXBuilder extends VarAccess {
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxBuilder */
+deprecated class SafeSAXBuilder = SafeSaxBuilder;
+
 /*
  * The case in
  * https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#jaxb-unmarshaller
@@ -435,21 +447,27 @@ class SafeSAXBuilder extends VarAccess {
 /**
  * The class `javax.xml.parsers.SAXParser`.
  */
-class SAXParser extends RefType {
-  SAXParser() { this.hasQualifiedName("javax.xml.parsers", "SAXParser") }
+class SaxParser extends RefType {
+  SaxParser() { this.hasQualifiedName("javax.xml.parsers", "SAXParser") }
 }
 
-/** The class `javax.xml.parsers.SAXParserFactory`. */
-class SAXParserFactory extends RefType {
-  SAXParserFactory() { this.hasQualifiedName("javax.xml.parsers", "SAXParserFactory") }
+/** DEPRECATED: Alias for SaxParser */
+deprecated class SAXParser = SaxParser;
+
+/** The class `javax.xml.parsers.SaxParserFactory`. */
+class SaxParserFactory extends RefType {
+  SaxParserFactory() { this.hasQualifiedName("javax.xml.parsers", "SAXParserFactory") }
 }
 
-/** A call to `SAXParser.parse`. */
-class SAXParserParse extends XmlParserCall {
-  SAXParserParse() {
+/** DEPRECATED: Alias for SaxParserFactory */
+deprecated class SAXParserFactory = SaxParserFactory;
+
+/** A call to `SaxParser.parse`. */
+class SaxParserParse extends XmlParserCall {
+  SaxParserParse() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXParser and
+      m.getDeclaringType() instanceof SaxParser and
       m.hasName("parse")
     )
   }
@@ -457,44 +475,50 @@ class SAXParserParse extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(SafeSAXParserFlowConfig sp | sp.hasFlowToExpr(this.getQualifier()))
+    exists(SafeSaxParserFlowConfig sp | sp.hasFlowToExpr(this.getQualifier()))
   }
 }
 
-/** A `ParserConfig` that is specific to `SAXParserFactory`. */
-class SAXParserFactoryConfig extends ParserConfig {
-  SAXParserFactoryConfig() {
+/** DEPRECATED: Alias for SaxParserParse */
+deprecated class SAXParserParse = SaxParserParse;
+
+/** A `ParserConfig` that is specific to `SaxParserFactory`. */
+class SaxParserFactoryConfig extends ParserConfig {
+  SaxParserFactoryConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXParserFactory and
+      m.getDeclaringType() instanceof SaxParserFactory and
       m.hasName("setFeature")
     )
   }
 }
 
+/** DEPRECATED: Alias for SaxParserFactoryConfig */
+deprecated class SAXParserFactoryConfig = SaxParserFactoryConfig;
+
 /**
  * A safely configured `SAXParserFactory`.
  */
-class SafeSAXParserFactory extends VarAccess {
-  SafeSAXParserFactory() {
+class SafeSaxParserFactory extends VarAccess {
+  SafeSaxParserFactory() {
     exists(Variable v | v = this.getVariable() |
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config.enables(singleSafeConfig())
       )
       or
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-general-entities"
               ))
       ) and
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-parameter-entities"
               ))
       ) and
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() =
@@ -505,18 +529,21 @@ class SafeSAXParserFactory extends VarAccess {
   }
 }
 
-private class SafeSAXParserFactoryToNewSAXParserFlowConfig extends DataFlow5::Configuration {
-  SafeSAXParserFactoryToNewSAXParserFlowConfig() {
+/** DEPRECATED: Alias for SafeSaxParserFactory */
+deprecated class SafeSAXParserFactory = SafeSaxParserFactory;
+
+private class SafeSaxParserFactoryToNewSaxParserFlowConfig extends DataFlow5::Configuration {
+  SafeSaxParserFactoryToNewSaxParserFlowConfig() {
     this = "XmlParsers::SafeSAXParserFactoryToNewSAXParserFlowConfig"
   }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXParserFactory }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxParserFactory }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma, Method m |
       sink.asExpr() = ma.getQualifier() and
       ma.getMethod() = m and
-      m.getDeclaringType() instanceof SAXParserFactory and
+      m.getDeclaringType() instanceof SaxParserFactory and
       m.hasName("newSAXParser")
     )
   }
@@ -524,45 +551,51 @@ private class SafeSAXParserFactoryToNewSAXParserFlowConfig extends DataFlow5::Co
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-private class SafeSAXParserFlowConfig extends DataFlow4::Configuration {
-  SafeSAXParserFlowConfig() { this = "XmlParsers::SafeSAXParserFlowConfig" }
+private class SafeSaxParserFlowConfig extends DataFlow4::Configuration {
+  SafeSaxParserFlowConfig() { this = "XmlParsers::SafeSAXParserFlowConfig" }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXParser }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxParser }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma |
-      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SAXParser
+      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SaxParser
     )
   }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** A `SAXParser` created from a safely configured `SAXParserFactory`. */
-class SafeSAXParser extends MethodAccess {
-  SafeSAXParser() {
-    exists(SafeSAXParserFactoryToNewSAXParserFlowConfig sdf |
-      this.getMethod().getDeclaringType() instanceof SAXParserFactory and
+/** A `SaxParser` created from a safely configured `SaxParserFactory`. */
+class SafeSaxParser extends MethodAccess {
+  SafeSaxParser() {
+    exists(SafeSaxParserFactoryToNewSaxParserFlowConfig sdf |
+      this.getMethod().getDeclaringType() instanceof SaxParserFactory and
       this.getMethod().hasName("newSAXParser") and
       sdf.hasFlowToExpr(this.getQualifier())
     )
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxParser */
+deprecated class SafeSAXParser = SafeSaxParser;
+
 /* SAXReader: https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#saxreader */
 /**
  * The class `org.dom4j.io.SAXReader`.
  */
-class SAXReader extends RefType {
-  SAXReader() { this.hasQualifiedName("org.dom4j.io", "SAXReader") }
+class SaxReader extends RefType {
+  SaxReader() { this.hasQualifiedName("org.dom4j.io", "SAXReader") }
 }
 
-/** A call to `SAXReader.read`. */
-class SAXReaderRead extends XmlParserCall {
-  SAXReaderRead() {
+/** DEPRECATED: Alias for SaxReader */
+deprecated class SAXReader = SaxReader;
+
+/** A call to `SaxReader.read`. */
+class SaxReaderRead extends XmlParserCall {
+  SaxReaderRead() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXReader and
+      m.getDeclaringType() instanceof SaxReader and
       m.hasName("read")
     )
   }
@@ -570,52 +603,58 @@ class SAXReaderRead extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(SafeSAXReaderFlowConfig sr | sr.hasFlowToExpr(this.getQualifier()))
+    exists(SafeSaxReaderFlowConfig sr | sr.hasFlowToExpr(this.getQualifier()))
   }
 }
 
-/** A `ParserConfig` specific to `SAXReader`. */
-class SAXReaderConfig extends ParserConfig {
-  SAXReaderConfig() {
+/** DEPRECATED: Alias for SaxReaderRead */
+deprecated class SAXReaderRead = SaxReaderRead;
+
+/** A `ParserConfig` specific to `SaxReader`. */
+class SaxReaderConfig extends ParserConfig {
+  SaxReaderConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXReader and
+      m.getDeclaringType() instanceof SaxReader and
       m.hasName("setFeature")
     )
   }
 }
 
-private class SafeSAXReaderFlowConfig extends DataFlow4::Configuration {
-  SafeSAXReaderFlowConfig() { this = "XmlParsers::SafeSAXReaderFlowConfig" }
+/** DEPRECATED: Alias for SaxReaderConfig */
+deprecated class SAXReaderConfig = SaxReaderConfig;
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXReader }
+private class SafeSaxReaderFlowConfig extends DataFlow4::Configuration {
+  SafeSaxReaderFlowConfig() { this = "XmlParsers::SafeSAXReaderFlowConfig" }
+
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxReader }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma |
-      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SAXReader
+      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SaxReader
     )
   }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** A safely configured `SAXReader`. */
-class SafeSAXReader extends VarAccess {
-  SafeSAXReader() {
+/** A safely configured `SaxReader`. */
+class SafeSaxReader extends VarAccess {
+  SafeSaxReader() {
     exists(Variable v | v = this.getVariable() |
-      exists(SAXReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-general-entities"
               ))
       ) and
-      exists(SAXReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-parameter-entities"
               ))
       ) and
-      exists(SAXReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .enables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://apache.org/xml/features/disallow-doctype-decl"
@@ -625,18 +664,24 @@ class SafeSAXReader extends VarAccess {
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxReader */
+deprecated class SafeSAXReader = SafeSaxReader;
+
 /* https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#xmlreader */
-/** The class `org.xml.sax.XMLReader`. */
-class XMLReader extends RefType {
-  XMLReader() { this.hasQualifiedName("org.xml.sax", "XMLReader") }
+/** The class `org.xml.sax.XmlReader`. */
+class XmlReader extends RefType {
+  XmlReader() { this.hasQualifiedName("org.xml.sax", "XMLReader") }
 }
 
-/** A call to `XMLReader.read`. */
-class XMLReaderParse extends XmlParserCall {
-  XMLReaderParse() {
+/** DEPRECATED: Alias for XmlReader */
+deprecated class XMLReader = XmlReader;
+
+/** A call to `XmlReader.read`. */
+class XmlReaderParse extends XmlParserCall {
+  XmlReaderParse() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof XMLReader and
+      m.getDeclaringType() instanceof XmlReader and
       m.hasName("parse")
     )
   }
@@ -644,59 +689,69 @@ class XMLReaderParse extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(ExplicitlySafeXMLReader sr | sr.flowsTo(this.getQualifier())) or
-    exists(CreatedSafeXMLReader cr | cr.flowsTo(this.getQualifier()))
+    exists(ExplicitlySafeXmlReader sr | sr.flowsTo(this.getQualifier())) or
+    exists(CreatedSafeXmlReader cr | cr.flowsTo(this.getQualifier()))
   }
 }
 
-/** A `ParserConfig` specific to the `XMLReader`. */
-class XMLReaderConfig extends ParserConfig {
-  XMLReaderConfig() {
+/** DEPRECATED: Alias for XmlReaderParse */
+deprecated class XMLReaderParse = XmlReaderParse;
+
+/** A `ParserConfig` specific to the `XmlReader`. */
+class XmlReaderConfig extends ParserConfig {
+  XmlReaderConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof XMLReader and
+      m.getDeclaringType() instanceof XmlReader and
       m.hasName("setFeature")
     )
   }
 }
 
-private class ExplicitlySafeXMLReaderFlowConfig extends DataFlow3::Configuration {
-  ExplicitlySafeXMLReaderFlowConfig() { this = "XmlParsers::ExplicitlySafeXMLReaderFlowConfig" }
+/** DEPRECATED: Alias for XmlReaderConfig */
+deprecated class XMLReaderConfig = XmlReaderConfig;
+
+private class ExplicitlySafeXmlReaderFlowConfig extends DataFlow3::Configuration {
+  ExplicitlySafeXmlReaderFlowConfig() { this = "XmlParsers::ExplicitlySafeXMLReaderFlowConfig" }
 
   override predicate isSource(DataFlow::Node src) {
-    src.asExpr() instanceof ExplicitlySafeXMLReader
+    src.asExpr() instanceof ExplicitlySafeXmlReader
   }
 
-  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXMLReaderFlowSink }
+  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXmlReaderFlowSink }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-class SafeXMLReaderFlowSink extends Expr {
-  SafeXMLReaderFlowSink() {
-    this = any(XMLReaderParse p).getQualifier() or
-    this = any(ConstructedSAXSource s).getArgument(0) or
-    this = any(SAXSourceSetReader s).getArgument(0)
+/** An argument to a safe XML reader. */
+class SafeXmlReaderFlowSink extends Expr {
+  SafeXmlReaderFlowSink() {
+    this = any(XmlReaderParse p).getQualifier() or
+    this = any(ConstructedSaxSource s).getArgument(0) or
+    this = any(SaxSourceSetReader s).getArgument(0)
   }
 }
 
-/** An `XMLReader` that is explicitly configured to be safe. */
-class ExplicitlySafeXMLReader extends VarAccess {
-  ExplicitlySafeXMLReader() {
+/** DEPRECATED: Alias for SafeXmlReaderFlowSink */
+deprecated class SafeXMLReaderFlowSink = SafeXmlReaderFlowSink;
+
+/** An `XmlReader` that is explicitly configured to be safe. */
+class ExplicitlySafeXmlReader extends VarAccess {
+  ExplicitlySafeXmlReader() {
     exists(Variable v | v = this.getVariable() |
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-general-entities"
               ))
       ) and
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-parameter-entities"
               ))
       ) and
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() =
@@ -704,7 +759,7 @@ class ExplicitlySafeXMLReader extends VarAccess {
               ))
       )
       or
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .enables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://apache.org/xml/features/disallow-doctype-decl"
@@ -713,35 +768,39 @@ class ExplicitlySafeXMLReader extends VarAccess {
     )
   }
 
-  predicate flowsTo(SafeXMLReaderFlowSink sink) {
-    any(ExplicitlySafeXMLReaderFlowConfig conf)
+  /** Holds if `SafeXmlReaderFlowSink` detects flow from this to `sink` */
+  predicate flowsTo(SafeXmlReaderFlowSink sink) {
+    any(ExplicitlySafeXmlReaderFlowConfig conf)
         .hasFlow(DataFlow::exprNode(this), DataFlow::exprNode(sink))
   }
 }
 
-private class CreatedSafeXMLReaderFlowConfig extends DataFlow3::Configuration {
-  CreatedSafeXMLReaderFlowConfig() { this = "XmlParsers::CreatedSafeXMLReaderFlowConfig" }
+/** DEPRECATED: Alias for ExplicitlySafeXmlReader */
+deprecated class ExplicitlySafeXMLReader = ExplicitlySafeXmlReader;
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof CreatedSafeXMLReader }
+private class CreatedSafeXmlReaderFlowConfig extends DataFlow3::Configuration {
+  CreatedSafeXmlReaderFlowConfig() { this = "XmlParsers::CreatedSafeXMLReaderFlowConfig" }
 
-  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXMLReaderFlowSink }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof CreatedSafeXmlReader }
+
+  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXmlReaderFlowSink }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** An `XMLReader` that is obtained from a safe source. */
-class CreatedSafeXMLReader extends Call {
-  CreatedSafeXMLReader() {
+/** An `XmlReader` that is obtained from a safe source. */
+class CreatedSafeXmlReader extends Call {
+  CreatedSafeXmlReader() {
     //Obtained from SAXParser
-    exists(SafeSAXParserFlowConfig safeParser |
-      this.(MethodAccess).getMethod().getDeclaringType() instanceof SAXParser and
+    exists(SafeSaxParserFlowConfig safeParser |
+      this.(MethodAccess).getMethod().getDeclaringType() instanceof SaxParser and
       this.(MethodAccess).getMethod().hasName("getXMLReader") and
       safeParser.hasFlowToExpr(this.getQualifier())
     )
     or
     //Obtained from SAXReader
-    exists(SafeSAXReaderFlowConfig safeReader |
-      this.(MethodAccess).getMethod().getDeclaringType() instanceof SAXReader and
+    exists(SafeSaxReaderFlowConfig safeReader |
+      this.(MethodAccess).getMethod().getDeclaringType() instanceof SaxReader and
       this.(MethodAccess).getMethod().hasName("getXMLReader") and
       safeReader.hasFlowToExpr(this.getQualifier())
     )
@@ -753,28 +812,35 @@ class CreatedSafeXMLReader extends Call {
     )
   }
 
-  predicate flowsTo(SafeXMLReaderFlowSink sink) {
-    any(CreatedSafeXMLReaderFlowConfig conf)
+  /** Holds if `CreatedSafeXmlReaderFlowConfig` detects flow from this to `sink` */
+  predicate flowsTo(SafeXmlReaderFlowSink sink) {
+    any(CreatedSafeXmlReaderFlowConfig conf)
         .hasFlow(DataFlow::exprNode(this), DataFlow::exprNode(sink))
   }
 }
 
+/** DEPRECATED: Alias for CreatedSafeXmlReader */
+deprecated class CreatedSafeXMLReader = CreatedSafeXmlReader;
+
 /*
  * SAXSource in
  * https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#jaxb-unmarshaller
  */
 
-/** The class `javax.xml.transform.sax.SAXSource` */
-class SAXSource extends RefType {
-  SAXSource() { this.hasQualifiedName("javax.xml.transform.sax", "SAXSource") }
+/** The class `javax.xml.transform.sax.SaxSource` */
+class SaxSource extends RefType {
+  SaxSource() { this.hasQualifiedName("javax.xml.transform.sax", "SAXSource") }
 }
 
-/** A call to the constructor of `SAXSource` with `XMLReader` and `InputSource`. */
-class ConstructedSAXSource extends ClassInstanceExpr {
-  ConstructedSAXSource() {
-    this.getConstructedType() instanceof SAXSource and
+/** DEPRECATED: Alias for SaxSource */
+deprecated class SAXSource = SaxSource;
+
+/** A call to the constructor of `SaxSource` with `XmlReader` and `InputSource`. */
+class ConstructedSaxSource extends ClassInstanceExpr {
+  ConstructedSaxSource() {
+    this.getConstructedType() instanceof SaxSource and
     this.getNumArgument() = 2 and
-    this.getArgument(0).getType() instanceof XMLReader
+    this.getArgument(0).getType() instanceof XmlReader
   }
 
   /**
@@ -782,40 +848,49 @@ class ConstructedSAXSource extends ClassInstanceExpr {
    */
   Expr getSink() { result = this.getArgument(1) }
 
-  /** Holds if the resulting `SAXSource` is safe. */
+  /** Holds if the resulting `SaxSource` is safe. */
   predicate isSafe() {
-    exists(CreatedSafeXMLReader safeReader | safeReader.flowsTo(this.getArgument(0))) or
-    exists(ExplicitlySafeXMLReader safeReader | safeReader.flowsTo(this.getArgument(0)))
+    exists(CreatedSafeXmlReader safeReader | safeReader.flowsTo(this.getArgument(0))) or
+    exists(ExplicitlySafeXmlReader safeReader | safeReader.flowsTo(this.getArgument(0)))
   }
 }
 
-/** A call to the `SAXSource.setXMLReader` method. */
-class SAXSourceSetReader extends MethodAccess {
-  SAXSourceSetReader() {
+/** DEPRECATED: Alias for ConstructedSaxSource */
+deprecated class ConstructedSAXSource = ConstructedSaxSource;
+
+/** A call to the `SaxSource.setXMLReader` method. */
+class SaxSourceSetReader extends MethodAccess {
+  SaxSourceSetReader() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXSource and
+      m.getDeclaringType() instanceof SaxSource and
       m.hasName("setXMLReader")
     )
   }
 }
 
-/** A `SAXSource` that is safe to use. */
-class SafeSAXSource extends Expr {
-  SafeSAXSource() {
+/** DEPRECATED: Alias for SaxSourceSetReader */
+deprecated class SAXSourceSetReader = SaxSourceSetReader;
+
+/** A `SaxSource` that is safe to use. */
+class SafeSaxSource extends Expr {
+  SafeSaxSource() {
     exists(Variable v | v = this.(VarAccess).getVariable() |
-      exists(SAXSourceSetReader s | s.getQualifier() = v.getAnAccess() |
+      exists(SaxSourceSetReader s | s.getQualifier() = v.getAnAccess() |
         (
-          exists(CreatedSafeXMLReader safeReader | safeReader.flowsTo(s.getArgument(0))) or
-          exists(ExplicitlySafeXMLReader safeReader | safeReader.flowsTo(s.getArgument(0)))
+          exists(CreatedSafeXmlReader safeReader | safeReader.flowsTo(s.getArgument(0))) or
+          exists(ExplicitlySafeXmlReader safeReader | safeReader.flowsTo(s.getArgument(0)))
         )
       )
     )
     or
-    this.(ConstructedSAXSource).isSafe()
+    this.(ConstructedSaxSource).isSafe()
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxSource */
+deprecated class SafeSAXSource = SafeSaxSource;
+
 /* Transformer: https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#transformerfactory */
 /** An access to a method use for configuring a transformer or schema. */
 abstract class TransformerConfig extends MethodAccess {
@@ -992,8 +1067,8 @@ class SafeTransformer extends MethodAccess {
  */
 
 /** A call to `SAXTransformerFactory.newFilter`. */
-class SAXTransformerFactoryNewXMLFilter extends XmlParserCall {
-  SAXTransformerFactoryNewXMLFilter() {
+class SaxTransformerFactoryNewXmlFilter extends XmlParserCall {
+  SaxTransformerFactoryNewXmlFilter() {
     exists(Method m |
       this.getMethod() = m and
       m.getDeclaringType().hasQualifiedName("javax.xml.transform.sax", "SAXTransformerFactory") and
@@ -1008,6 +1083,9 @@ class SAXTransformerFactoryNewXMLFilter extends XmlParserCall {
   }
 }
 
+/** DEPRECATED: Alias for SaxTransformerFactoryNewXmlFilter */
+deprecated class SAXTransformerFactoryNewXMLFilter = SaxTransformerFactoryNewXmlFilter;
+
 /* Schema: https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#schemafactory */
 /** The class `javax.xml.validation.SchemaFactory`. */
 class SchemaFactory extends RefType {
@@ -1116,8 +1194,8 @@ class XPathEvaluate extends XmlParserCall {
 
 // Sink methods in simplexml http://simple.sourceforge.net/home.php
 /** A call to `read` or `validate` in `Persister`. */
-class SimpleXMLPersisterCall extends XmlParserCall {
-  SimpleXMLPersisterCall() {
+class SimpleXmlPersisterCall extends XmlParserCall {
+  SimpleXmlPersisterCall() {
     exists(Method m |
       this.getMethod() = m and
       (m.hasName("validate") or m.hasName("read")) and
@@ -1130,9 +1208,12 @@ class SimpleXMLPersisterCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlPersisterCall */
+deprecated class SimpleXMLPersisterCall = SimpleXmlPersisterCall;
+
 /** A call to `provide` in `Provider`. */
-class SimpleXMLProviderCall extends XmlParserCall {
-  SimpleXMLProviderCall() {
+class SimpleXmlProviderCall extends XmlParserCall {
+  SimpleXmlProviderCall() {
     exists(Method m |
       this.getMethod() = m and
       m.hasName("provide") and
@@ -1148,9 +1229,12 @@ class SimpleXMLProviderCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlProviderCall */
+deprecated class SimpleXMLProviderCall = SimpleXmlProviderCall;
+
 /** A call to `read` in `NodeBuilder`. */
-class SimpleXMLNodeBuilderCall extends XmlParserCall {
-  SimpleXMLNodeBuilderCall() {
+class SimpleXmlNodeBuilderCall extends XmlParserCall {
+  SimpleXmlNodeBuilderCall() {
     exists(Method m |
       this.getMethod() = m and
       m.hasName("read") and
@@ -1163,9 +1247,12 @@ class SimpleXMLNodeBuilderCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlNodeBuilderCall */
+deprecated class SimpleXMLNodeBuilderCall = SimpleXmlNodeBuilderCall;
+
 /** A call to the `format` method of the `Formatter`. */
-class SimpleXMLFormatterCall extends XmlParserCall {
-  SimpleXMLFormatterCall() {
+class SimpleXmlFormatterCall extends XmlParserCall {
+  SimpleXmlFormatterCall() {
     exists(Method m |
       this.getMethod() = m and
       m.hasName("format") and
@@ -1178,6 +1265,9 @@ class SimpleXMLFormatterCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlFormatterCall */
+deprecated class SimpleXMLFormatterCall = SimpleXmlFormatterCall;
+
 /** A configuration for secure processing. */
 Expr configSecureProcessing() {
   result.(ConstantStringExpr).getStringValue() =
diff --git a/java/ql/lib/semmle/code/java/security/XsltInjection.qll b/java/ql/lib/semmle/code/java/security/XsltInjection.qll
index 75288492004..db96879181c 100644
--- a/java/ql/lib/semmle/code/java/security/XsltInjection.qll
+++ b/java/ql/lib/semmle/code/java/security/XsltInjection.qll
@@ -112,7 +112,7 @@ private predicate documentBuilderStep(DataFlow::Node n1, DataFlow::Node n2) {
  * `new DOMSource(tainted)`.
  */
 private predicate domSourceStep(DataFlow::Node n1, DataFlow::Node n2) {
-  exists(ConstructorCall cc | cc.getConstructedType() instanceof TypeDOMSource |
+  exists(ConstructorCall cc | cc.getConstructedType() instanceof TypeDomSource |
     n1.asExpr() = cc.getAnArgument() and
     n2.asExpr() = cc
   )
@@ -179,8 +179,8 @@ private class TypeStAXSource extends Class {
 }
 
 /** The class `javax.xml.transform.dom.DOMSource`. */
-private class TypeDOMSource extends Class {
-  TypeDOMSource() { this.hasQualifiedName("javax.xml.transform.dom", "DOMSource") }
+private class TypeDomSource extends Class {
+  TypeDomSource() { this.hasQualifiedName("javax.xml.transform.dom", "DOMSource") }
 }
 
 /** The interface `javax.xml.transform.Templates`. */
diff --git a/java/ql/lib/semmle/code/xml/WebXML.qll b/java/ql/lib/semmle/code/xml/WebXML.qll
index c7dec5fd600..67e46b10026 100644
--- a/java/ql/lib/semmle/code/xml/WebXML.qll
+++ b/java/ql/lib/semmle/code/xml/WebXML.qll
@@ -3,13 +3,16 @@ import java
 /**
  * Holds if any `web.xml` files are included in this snapshot.
  */
-predicate isWebXMLIncluded() { exists(WebXMLFile webXML) }
+predicate isWebXmlIncluded() { exists(WebXmlFile webXml) }
+
+/** DEPRECATED: Alias for isWebXmlIncluded */
+deprecated predicate isWebXMLIncluded = isWebXmlIncluded/0;
 
 /**
  * A deployment descriptor file, typically called `web.xml`.
  */
-class WebXMLFile extends XMLFile {
-  WebXMLFile() {
+class WebXmlFile extends XMLFile {
+  WebXmlFile() {
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "web-app"
   }
@@ -28,11 +31,14 @@ class WebXMLFile extends XMLFile {
   }
 }
 
+/** DEPRECATED: Alias for WebXmlFile */
+deprecated class WebXMLFile = WebXmlFile;
+
 /**
  * An XML element in a `WebXMLFile`.
  */
-class WebXMLElement extends XMLElement {
-  WebXMLElement() { this.getFile() instanceof WebXMLFile }
+class WebXmlElement extends XMLElement {
+  WebXmlElement() { this.getFile() instanceof WebXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -40,10 +46,13 @@ class WebXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for WebXmlElement */
+deprecated class WebXMLElement = WebXmlElement;
+
 /**
  * A `<context-param>` element in a `web.xml` file.
  */
-class WebContextParameter extends WebXMLElement {
+class WebContextParameter extends WebXmlElement {
   WebContextParameter() { this.getName() = "context-param" }
 
   /**
@@ -60,28 +69,28 @@ class WebContextParameter extends WebXMLElement {
 /**
  * A `<param-name>` element in a `web.xml` file.
  */
-class WebContextParamName extends WebXMLElement {
+class WebContextParamName extends WebXmlElement {
   WebContextParamName() { this.getName() = "param-name" }
 }
 
 /**
  * A `<param-value>` element in a `web.xml` file.
  */
-class WebContextParamValue extends WebXMLElement {
+class WebContextParamValue extends WebXmlElement {
   WebContextParamValue() { this.getName() = "param-value" }
 }
 
 /**
  * A `<filter>` element in a `web.xml` file.
  */
-class WebFilter extends WebXMLElement {
+class WebFilter extends WebXmlElement {
   WebFilter() { this.getName() = "filter" }
 }
 
 /**
  * A `<filter-class>` element in a `web.xml` file, nested under a `<filter>` element.
  */
-class WebFilterClass extends WebXMLElement {
+class WebFilterClass extends WebXmlElement {
   WebFilterClass() {
     this.getName() = "filter-class" and
     this.getParent() instanceof WebFilter
@@ -93,14 +102,14 @@ class WebFilterClass extends WebXMLElement {
 /**
  * A `<servlet>` element in a `web.xml` file.
  */
-class WebServlet extends WebXMLElement {
+class WebServlet extends WebXmlElement {
   WebServlet() { this.getName() = "servlet" }
 }
 
 /**
  * A `<servlet-class>` element in a `web.xml` file, nested under a `<servlet>` element.
  */
-class WebServletClass extends WebXMLElement {
+class WebServletClass extends WebXmlElement {
   WebServletClass() {
     this.getName() = "servlet-class" and
     this.getParent() instanceof WebServlet
@@ -112,14 +121,14 @@ class WebServletClass extends WebXMLElement {
 /**
  * A `<listener>` element in a `web.xml` file.
  */
-class WebListener extends WebXMLElement {
+class WebListener extends WebXmlElement {
   WebListener() { this.getName() = "listener" }
 }
 
 /**
  * A `<listener-class>` element in a `web.xml` file, nested under a `<listener>` element.
  */
-class WebListenerClass extends WebXMLElement {
+class WebListenerClass extends WebXmlElement {
   WebListenerClass() {
     this.getName() = "listener-class" and
     this.getParent() instanceof WebListener
@@ -134,7 +143,7 @@ class WebListenerClass extends WebXMLElement {
 /**
  * An `<error-page>` element in a `web.xml` file.
  */
-class WebErrorPage extends WebXMLElement {
+class WebErrorPage extends WebXmlElement {
   WebErrorPage() { this.getName() = "error-page" }
 
   /**
@@ -151,7 +160,7 @@ class WebErrorPage extends WebXMLElement {
 /**
  * An `<exception-type>` element in a `web.xml` file, nested under an `<error-page>` element.
  */
-class WebErrorPageType extends WebXMLElement {
+class WebErrorPageType extends WebXmlElement {
   WebErrorPageType() {
     this.getName() = "exception-type" and
     this.getParent() instanceof WebErrorPage
@@ -161,7 +170,7 @@ class WebErrorPageType extends WebXMLElement {
 /**
  * A `<location>` element in a `web.xml` file, nested under an `<error-page>` element.
  */
-class WebErrorPageLocation extends WebXMLElement {
+class WebErrorPageLocation extends WebXmlElement {
   WebErrorPageLocation() {
     this.getName() = "location" and
     this.getParent() instanceof WebErrorPage
diff --git a/java/ql/lib/semmle/code/xml/XML.qll b/java/ql/lib/semmle/code/xml/XML.qll
index dc76884b73c..fb781a4683f 100755
--- a/java/ql/lib/semmle/code/xml/XML.qll
+++ b/java/ql/lib/semmle/code/xml/XML.qll
@@ -4,21 +4,14 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
-  /**
-   * DEPRECATED: Use `getLocation()` instead.
-   *
-   * Gets the source location for this element.
-   */
-  deprecated Location getALocation() { result = this.getLocation() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -83,21 +76,6 @@ class XMLParent extends @xmlparent {
   /** Gets the number of places in the body of this XML parent where text occurs. */
   int getNumberOfCharacterSets() { result = count(int pos | xmlChars(_, _, this, pos, _, _)) }
 
-  /**
-   * DEPRECATED: Internal.
-   *
-   * Append the character sequences of this XML parent from left to right, separated by a space,
-   * up to a specified (zero-based) index.
-   */
-  deprecated string charsSetUpTo(int n) {
-    n = 0 and xmlChars(_, result, this, 0, _, _)
-    or
-    n > 0 and
-    exists(string chars | xmlChars(_, chars, this, n, _, _) |
-      result = this.charsSetUpTo(n - 1) + " " + chars
-    )
-  }
-
   /**
    * Gets the result of appending all the character sequences of this XML parent from
    * left to right, separated by a space.
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 72a5dc97064..b2887d972db 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.0.11
+
 ## 0.0.10
 
 ### Breaking Changes
diff --git a/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql b/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql
index 32a83c26acf..504825807fd 100644
--- a/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql	
+++ b/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql	
@@ -100,7 +100,7 @@ class SpringPureClass extends Class {
       // Setter method by autowiring, either in the XML or by annotation
       c = this.getAMethod().(SpringBeanAutowiredCallable)
       or
-      c = this.getAMethod().(SpringBeanXMLAutowiredSetterMethod)
+      c = this.getAMethod().(SpringBeanXmlAutowiredSetterMethod)
     )
   }
 }
@@ -189,7 +189,7 @@ class LiveSpringBean extends SpringBean {
       )
       or
       // Injected by autowired specified in XML
-      exists(SpringBeanXMLAutowiredSetterMethod setterMethod |
+      exists(SpringBeanXmlAutowiredSetterMethod setterMethod |
         // The config method must be on a live bean
         setterMethod.getDeclaringType().(SpringBeanRefType).getSpringBean() instanceof
           LiveSpringBean
diff --git a/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql b/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql
index 1d924dc9d6d..b7aad1b85fb 100644
--- a/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql	
+++ b/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql	
@@ -51,7 +51,7 @@ class SpringPropertyUseShortcut extends SpringProperty {
   }
 }
 
-from SpringXMLElement springElement, string msg
+from SpringXmlElement springElement, string msg
 where
   exists(SpringConstructorArgUseShortcut cons | cons = springElement and msg = cons.getMessage())
   or
diff --git a/java/ql/src/Likely Bugs/Concurrency/BusyWait.ql b/java/ql/src/Likely Bugs/Concurrency/BusyWait.ql
index 22ed091e052..e9b160222bc 100644
--- a/java/ql/src/Likely Bugs/Concurrency/BusyWait.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/BusyWait.ql	
@@ -16,13 +16,6 @@
 
 import java
 
-class ReachFromStmt extends Stmt {
-  ReachFromStmt() {
-    exists(Method m | m.getBody() = this) or
-    exists(WhileStmt w | w.getStmt() = this)
-  }
-}
-
 class SleepMethod extends Method {
   SleepMethod() {
     this.getName() = "sleep" and
diff --git a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql
index 41be2be2c52..3d0b45dabed 100644
--- a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql	
+++ b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql	
@@ -74,8 +74,8 @@ where
   ) and
   // None of the ssa variables in `cond` are updated inside the loop.
   forex(SsaVariable ssa, RValue use | ssa.getAUse() = use and use.getParent*() = cond |
-    not ssa.getCFGNode().getEnclosingStmt().getEnclosingStmt*() = loop or
-    ssa.getCFGNode().(Expr).getParent*() = loop.(ForStmt).getAnInit()
+    not ssa.getCfgNode().getEnclosingStmt().getEnclosingStmt*() = loop or
+    ssa.getCfgNode().(Expr).getParent*() = loop.(ForStmt).getAnInit()
   ) and
   // And `cond` does not use method calls, field reads, or array reads.
   not exists(MethodAccess ma | ma.getParent*() = cond) and
diff --git a/java/ql/src/Performance/ConcatenationInLoops.ql b/java/ql/src/Performance/ConcatenationInLoops.ql
index 2f0d771026b..e4280678e4b 100644
--- a/java/ql/src/Performance/ConcatenationInLoops.ql
+++ b/java/ql/src/Performance/ConcatenationInLoops.ql
@@ -15,11 +15,6 @@ import semmle.code.java.Expr
 import semmle.code.java.Statement
 import semmle.code.java.JDK
 
-/** A use of `+` that has type `String`. */
-class StringCat extends AddExpr {
-  StringCat() { this.getType() instanceof TypeString }
-}
-
 /**
  * An assignment of the form
  *
diff --git a/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql b/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
index f9643429d72..23c82397de0 100644
--- a/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
+++ b/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
@@ -12,7 +12,7 @@ import java
 import semmle.code.java.security.ExternalAPIs
 import semmle.code.java.dataflow.DataFlow
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql b/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
index 63c66ffa9d0..b4a2e209513 100644
--- a/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
+++ b/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
@@ -15,8 +15,8 @@ import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.security.ExternalAPIs
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getMethodDescription() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getMethodDescription() +
     " with untrusted data from $@.", source, source.toString()
diff --git a/java/ql/src/Security/CWE/CWE-079/XSS.ql b/java/ql/src/Security/CWE/CWE-079/XSS.ql
index 885a6f7a47b..c488a5d08d4 100644
--- a/java/ql/src/Security/CWE/CWE-079/XSS.ql
+++ b/java/ql/src/Security/CWE/CWE-079/XSS.ql
@@ -16,8 +16,8 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import DataFlow::PathGraph
 
-class XSSConfig extends TaintTracking::Configuration {
-  XSSConfig() { this = "XSSConfig" }
+class XssConfig extends TaintTracking::Configuration {
+  XssConfig() { this = "XSSConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
@@ -32,7 +32,7 @@ class XSSConfig extends TaintTracking::Configuration {
   }
 }
 
-from DataFlow::PathNode source, DataFlow::PathNode sink, XSSConfig conf
+from DataFlow::PathNode source, DataFlow::PathNode sink, XssConfig conf
 where conf.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "user-provided value"
diff --git a/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql b/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql
index e16a9bbc2e9..da318a5b7cb 100644
--- a/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql
+++ b/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql
@@ -16,15 +16,15 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import DataFlow::PathGraph
 
-class XSSLocalConfig extends TaintTracking::Configuration {
-  XSSLocalConfig() { this = "XSSLocalConfig" }
+class XssLocalConfig extends TaintTracking::Configuration {
+  XssLocalConfig() { this = "XSSLocalConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof LocalUserInput }
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof XssSink }
 }
 
-from DataFlow::PathNode source, DataFlow::PathNode sink, XSSLocalConfig conf
+from DataFlow::PathNode source, DataFlow::PathNode sink, XssLocalConfig conf
 where conf.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "user-provided value"
diff --git a/java/ql/src/Security/CWE/CWE-319/UseSSL.ql b/java/ql/src/Security/CWE/CWE-319/UseSSL.ql
index 1b267af52cf..ba3dee696dd 100644
--- a/java/ql/src/Security/CWE/CWE-319/UseSSL.ql
+++ b/java/ql/src/Security/CWE/CWE-319/UseSSL.ql
@@ -14,8 +14,8 @@ import java
 import semmle.code.java.dataflow.TypeFlow
 import semmle.code.java.security.Encryption
 
-class URLConnection extends RefType {
-  URLConnection() {
+class UrlConnection extends RefType {
+  UrlConnection() {
     this.getAnAncestor().hasQualifiedName("java.net", "URLConnection") and
     not this.hasName("JarURLConnection")
   }
@@ -29,7 +29,7 @@ from MethodAccess m, Class c, string type
 where
   m.getQualifier().getType() = c and
   (
-    c instanceof URLConnection and type = "connection"
+    c instanceof UrlConnection and type = "connection"
     or
     c instanceof Socket and type = "socket"
   ) and
diff --git a/java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.java b/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.java
similarity index 91%
rename from java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.java
rename to java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.java
index e1f7354b912..b64b80e0fdd 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.java
+++ b/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.java
@@ -14,5 +14,6 @@ public static void main(String[] args) {
         String password = "Pass@0rd";
 
         // GOOD: user password is never written to debug log
+        logger.debug("User password changed")
     }
 }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.qhelp b/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.qhelp
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.qhelp
rename to java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.qhelp
diff --git a/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql b/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql
new file mode 100644
index 00000000000..6f32b9768cb
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-532/SensitiveInfoLog.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Insertion of sensitive information into log files
+ * @description Writing sensitive information to log files can allow that
+ *              information to be leaked to an attacker more easily.
+ * @kind path-problem
+ * @problem.severity warning
+ * @security-severity 7.5
+ * @precision medium
+ * @id java/sensitive-log
+ * @tags security
+ *       external/cwe/cwe-532
+ */
+
+import java
+import semmle.code.java.security.SensitiveLoggingQuery
+import PathGraph
+
+from SensitiveLoggerConfiguration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
+where cfg.hasFlowPath(source, sink)
+select sink.getNode(), source, sink, "This $@ is written to a log file.", source.getNode(),
+  "potentially sensitive information"
diff --git a/java/ql/src/Security/CWE/CWE-611/XXE.ql b/java/ql/src/Security/CWE/CWE-611/XXE.ql
index bfcedb19d17..b50c9c7fef8 100644
--- a/java/ql/src/Security/CWE/CWE-611/XXE.ql
+++ b/java/ql/src/Security/CWE/CWE-611/XXE.ql
@@ -19,10 +19,10 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking2
 import DataFlow::PathGraph
 
-class SafeSAXSourceFlowConfig extends TaintTracking2::Configuration {
-  SafeSAXSourceFlowConfig() { this = "XmlParsers::SafeSAXSourceFlowConfig" }
+class SafeSaxSourceFlowConfig extends TaintTracking2::Configuration {
+  SafeSaxSourceFlowConfig() { this = "XmlParsers::SafeSAXSourceFlowConfig" }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXSource }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxSource }
 
   override predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(XmlParserCall parse).getSink()
@@ -33,7 +33,7 @@ class SafeSAXSourceFlowConfig extends TaintTracking2::Configuration {
 
 class UnsafeXxeSink extends DataFlow::ExprNode {
   UnsafeXxeSink() {
-    not exists(SafeSAXSourceFlowConfig safeSource | safeSource.hasFlowTo(this)) and
+    not exists(SafeSaxSourceFlowConfig safeSource | safeSource.hasFlowTo(this)) and
     exists(XmlParserCall parse |
       parse.getSink() = this.getExpr() and
       not parse.isSafe()
diff --git a/java/ql/src/Telemetry/ExternalAPI.qll b/java/ql/src/Telemetry/ExternalAPI.qll
index c3bd101662d..e8a1e007c12 100644
--- a/java/ql/src/Telemetry/ExternalAPI.qll
+++ b/java/ql/src/Telemetry/ExternalAPI.qll
@@ -12,8 +12,8 @@ private import semmle.code.java.dataflow.TaintTracking
 /**
  * An external API from either the Java Standard Library or a 3rd party library.
  */
-class ExternalAPI extends Callable {
-  ExternalAPI() { not this.fromSource() }
+class ExternalApi extends Callable {
+  ExternalApi() { not this.fromSource() }
 
   /** Holds if this API is not worth supporting */
   predicate isUninteresting() { this.isTestLibrary() or this.isParameterlessConstructor() }
@@ -80,6 +80,9 @@ class ExternalAPI extends Callable {
   predicate isSupported() { this.hasSummary() or this.isSource() or this.isSink() }
 }
 
+/** DEPRECATED: Alias for ExternalApi */
+deprecated class ExternalAPI = ExternalApi;
+
 private class TestLibrary extends RefType {
   TestLibrary() {
     this.getPackage()
diff --git a/java/ql/src/Telemetry/ExternalLibraryUsage.ql b/java/ql/src/Telemetry/ExternalLibraryUsage.ql
index 93052f19d3b..fd29d2fbea0 100644
--- a/java/ql/src/Telemetry/ExternalLibraryUsage.ql
+++ b/java/ql/src/Telemetry/ExternalLibraryUsage.ql
@@ -12,7 +12,7 @@ import ExternalAPI
 from int usages, string jarname
 where
   usages =
-    strictcount(Call c, ExternalAPI a |
+    strictcount(Call c, ExternalApi a |
       c.getCallee().getSourceDeclaration() = a and
       not c.getFile() instanceof GeneratedFile and
       a.jarContainer() = jarname and
diff --git a/java/ql/src/Telemetry/SupportedExternalSinks.ql b/java/ql/src/Telemetry/SupportedExternalSinks.ql
index f39794a23be..fc831f9fa59 100644
--- a/java/ql/src/Telemetry/SupportedExternalSinks.ql
+++ b/java/ql/src/Telemetry/SupportedExternalSinks.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   api.isSink() and
diff --git a/java/ql/src/Telemetry/SupportedExternalSources.ql b/java/ql/src/Telemetry/SupportedExternalSources.ql
index 91d51cd72fa..9e526007b00 100644
--- a/java/ql/src/Telemetry/SupportedExternalSources.ql
+++ b/java/ql/src/Telemetry/SupportedExternalSources.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   api.isSource() and
diff --git a/java/ql/src/Telemetry/SupportedExternalTaint.ql b/java/ql/src/Telemetry/SupportedExternalTaint.ql
index 71721923dea..7e7032a4730 100644
--- a/java/ql/src/Telemetry/SupportedExternalTaint.ql
+++ b/java/ql/src/Telemetry/SupportedExternalTaint.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   api.hasSummary() and
diff --git a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql
index e79e4938438..ab9df45091d 100644
--- a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql
+++ b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   not api.isSupported() and
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll
index a138351e656..82933aa9bac 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll	
@@ -44,8 +44,8 @@ predicate overwritten(SsaExplicitUpdate ssa) {
     not deadLocal(overwrite) and
     not overwrite.getDefiningExpr() instanceof LocalVariableDeclExpr and
     exists(BasicBlock bb1, BasicBlock bb2, int i, int j |
-      bb1.getNode(i) = ssa.getCFGNode() and
-      bb2.getNode(j) = overwrite.getCFGNode()
+      bb1.getNode(i) = ssa.getCfgNode() and
+      bb2.getNode(j) = overwrite.getCfgNode()
     |
       bb1.getABBSuccessor+() = bb2
       or
diff --git a/java/ql/src/change-notes/2022-03-11-sensitive-logging.md b/java/ql/src/change-notes/2022-03-11-sensitive-logging.md
new file mode 100644
index 00000000000..cfc4693b1cb
--- /dev/null
+++ b/java/ql/src/change-notes/2022-03-11-sensitive-logging.md
@@ -0,0 +1,4 @@
+---
+category: newQuery
+---
+* The query "Insertion of sensitive information into log files" (`java/sensitive-logging`) has been promoted from experimental to the main query pack. This query was originally [submitted as an experimental query by @luchua-bc](https://github.com/github/codeql/pull/3090).
\ No newline at end of file
diff --git a/java/ql/src/change-notes/released/0.0.11.md b/java/ql/src/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..eba254bd51f
--- /dev/null
+++ b/java/ql/src/change-notes/released/0.0.11.md
@@ -0,0 +1 @@
+## 0.0.11
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
index 871d6bb4737..238f586ff21 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
@@ -16,8 +16,8 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.ExternalFlow
 import DataFlow::PathGraph
 
-class URLConstructor extends ClassInstanceExpr {
-  URLConstructor() { this.getConstructor().getDeclaringType() instanceof TypeUrl }
+class UrlConstructor extends ClassInstanceExpr {
+  UrlConstructor() { this.getConstructor().getDeclaringType() instanceof TypeUrl }
 
   Expr stringArg() {
     // Query only in URL's that were constructed by calling the single parameter string constructor.
@@ -27,28 +27,21 @@ class URLConstructor extends ClassInstanceExpr {
   }
 }
 
-class URLOpenStreamMethod extends Method {
-  URLOpenStreamMethod() {
-    this.getDeclaringType() instanceof TypeUrl and
-    this.getName() = "openStream"
-  }
-}
-
-class RemoteURLToOpenStreamFlowConfig extends TaintTracking::Configuration {
-  RemoteURLToOpenStreamFlowConfig() { this = "OpenStream::RemoteURLToOpenStreamFlowConfig" }
+class RemoteUrlToOpenStreamFlowConfig extends TaintTracking::Configuration {
+  RemoteUrlToOpenStreamFlowConfig() { this = "OpenStream::RemoteURLToOpenStreamFlowConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess m |
-      sink.asExpr() = m.getQualifier() and m.getMethod() instanceof URLOpenStreamMethod
+      sink.asExpr() = m.getQualifier() and m.getMethod() instanceof UrlOpenStreamMethod
     )
     or
     sinkNode(sink, "url-open-stream")
   }
 
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-    exists(URLConstructor u |
+    exists(UrlConstructor u |
       node1.asExpr() = u.stringArg() and
       node2.asExpr() = u
     )
@@ -58,6 +51,6 @@ class RemoteURLToOpenStreamFlowConfig extends TaintTracking::Configuration {
 from DataFlow::PathNode source, DataFlow::PathNode sink, MethodAccess call
 where
   sink.getNode().asExpr() = call.getQualifier() and
-  any(RemoteURLToOpenStreamFlowConfig c).hasFlowPath(source, sink)
+  any(RemoteUrlToOpenStreamFlowConfig c).hasFlowPath(source, sink)
 select call, source, sink,
   "URL on which openStream is called may have been constructed from remote source"
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
index f43f9a34128..b7f01ce06cd 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
@@ -45,7 +45,7 @@ class ListType extends RefType {
 }
 
 /** Holds if the specified `method` uses MyBatis Mapper XMLElement `mmxx`. */
-predicate myBatisMapperXMLElementFromMethod(Method method, MyBatisMapperXMLElement mmxx) {
+predicate myBatisMapperXmlElementFromMethod(Method method, MyBatisMapperXmlElement mmxx) {
   exists(MyBatisMapperSqlOperation mbmxe | mbmxe.getMapperMethod() = method |
     mbmxe.getAChild*() = mmxx
     or
@@ -56,6 +56,9 @@ predicate myBatisMapperXMLElementFromMethod(Method method, MyBatisMapperXMLEleme
   )
 }
 
+/** DEPRECATED: Alias for myBatisMapperXmlElementFromMethod */
+deprecated predicate myBatisMapperXMLElementFromMethod = myBatisMapperXmlElementFromMethod/2;
+
 /** Holds if the specified `method` has Ibatis Sql operation annotation `isoa`. */
 predicate myBatisSqlOperationAnnotationFromMethod(Method method, IbatisSqlOperationAnnotation isoa) {
   exists(MyBatisSqlOperationAnnotationMethod msoam |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
index 908234fa3f3..9aeb95ea94a 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
@@ -45,11 +45,11 @@ private class MyBatisMapperXmlSqlInjectionConfiguration extends TaintTracking::C
 
 from
   MyBatisMapperXmlSqlInjectionConfiguration cfg, DataFlow::PathNode source, DataFlow::PathNode sink,
-  MyBatisMapperXMLElement mmxe, MethodAccess ma, string unsafeExpression
+  MyBatisMapperXmlElement mmxe, MethodAccess ma, string unsafeExpression
 where
   cfg.hasFlowPath(source, sink) and
   ma.getAnArgument() = sink.getNode().asExpr() and
-  myBatisMapperXMLElementFromMethod(ma.getMethod(), mmxe) and
+  myBatisMapperXmlElementFromMethod(ma.getMethod(), mmxe) and
   unsafeExpression = getAMybatisXmlSetValue(mmxe) and
   (
     isMybatisXmlOrAnnotationSqlInjection(sink.getNode(), ma, unsafeExpression)
diff --git a/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql b/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
index c8bff52333d..fbc3e0536b1 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
@@ -17,10 +17,10 @@ private class HttpOnlyConfig extends WebContextParameter {
 
   string getParamValueElementValue() { result = this.getParamValue().getValue() }
 
-  predicate isHTTPOnlySet() { this.getParamValueElementValue().toLowerCase() = "false" }
+  predicate isHttpOnlySet() { this.getParamValueElementValue().toLowerCase() = "false" }
 }
 
 from HttpOnlyConfig config
-where config.isHTTPOnlySet()
+where config.isHttpOnlySet()
 select config,
   "httpOnly should be enabled in tomcat config file to help mitigate cross-site scripting (XSS) attacks"
diff --git a/java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.ql b/java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.ql
deleted file mode 100644
index b84143d0b80..00000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-532/SensitiveInfoLog.ql
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @name Insertion of sensitive information into log files
- * @description Writing sensitive information to log files can give valuable
- *              guidance to an attacker or expose sensitive user information.
- * @kind path-problem
- * @problem.severity warning
- * @precision medium
- * @id java/sensitiveinfo-in-logfile
- * @tags security
- *       external/cwe/cwe-532
- */
-
-import java
-import semmle.code.java.dataflow.ExternalFlow
-import semmle.code.java.dataflow.TaintTracking
-import semmle.code.java.security.SensitiveActions
-import DataFlow
-import PathGraph
-
-/**
- * Gets a regular expression for matching names of variables that indicate the value being held may contain sensitive information
- */
-private string getACredentialRegex() { result = "(?i)(.*username|url).*" }
-
-/** Variable keeps sensitive information judging by its name * */
-class CredentialExpr extends Expr {
-  CredentialExpr() {
-    exists(Variable v | this = v.getAnAccess() |
-      v.getName().regexpMatch([getCommonSensitiveInfoRegex(), getACredentialRegex()])
-    )
-  }
-}
-
-class LoggerConfiguration extends DataFlow::Configuration {
-  LoggerConfiguration() { this = "Logger Configuration" }
-
-  override predicate isSource(DataFlow::Node source) { source.asExpr() instanceof CredentialExpr }
-
-  override predicate isSink(DataFlow::Node sink) { sinkNode(sink, "logging") }
-
-  override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    TaintTracking::localTaintStep(node1, node2)
-  }
-}
-
-from LoggerConfiguration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where cfg.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "Outputting $@ to log.", source.getNode(),
-  "sensitive information"
diff --git a/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql b/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
index c1667abdd3d..1ef4fb4d1f6 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
@@ -27,7 +27,7 @@ private class DefaultTomcatServlet extends WebServletClass {
 /**
  * The `<init-param>` element in a `web.xml` file, nested under a `<servlet>` element controlling directory listing.
  */
-class DirectoryListingInitParam extends WebXMLElement {
+class DirectoryListingInitParam extends WebXmlElement {
   DirectoryListingInitParam() {
     this.getName() = "init-param" and
     this.getAChild("param-name").getTextValue() = "listings" and
diff --git a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
index 12f6b29d692..94cdaafa553 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
@@ -23,7 +23,7 @@ class UnsafeUrlForwardFlowConfig extends TaintTracking::Configuration {
     not exists(MethodAccess ma, Method m | ma.getMethod() = m |
       (
         m instanceof HttpServletRequestGetRequestURIMethod or
-        m instanceof HttpServletRequestGetRequestURLMethod or
+        m instanceof HttpServletRequestGetRequestUrlMethod or
         m instanceof HttpServletRequestGetPathMethod
       ) and
       ma = source.asExpr()
diff --git a/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll b/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll
index 267b4bdef1d..996eca35850 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll
@@ -204,17 +204,20 @@ private class SafeDigesterFlowConfig extends DataFlow4::Configuration {
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** The class `java.beans.XMLDecoder`. */
-class XMLDecoder extends RefType {
-  XMLDecoder() { this.hasQualifiedName("java.beans", "XMLDecoder") }
+/** The class `java.beans.XmlDecoder`. */
+class XmlDecoder extends RefType {
+  XmlDecoder() { this.hasQualifiedName("java.beans", "XMLDecoder") }
 }
 
-/** A call to `XMLDecoder.readObject`. */
-class XMLDecoderReadObject extends XmlParserCall {
-  XMLDecoderReadObject() {
+/** DEPRECATED: Alias for XmlDecoder */
+deprecated class XMLDecoder = XmlDecoder;
+
+/** A call to `XmlDecoder.readObject`. */
+class XmlDecoderReadObject extends XmlParserCall {
+  XmlDecoderReadObject() {
     exists(Method m |
       this.getMethod() = m and
-      m.getDeclaringType() instanceof XMLDecoder and
+      m.getDeclaringType() instanceof XmlDecoder and
       m.hasName("readObject")
     )
   }
@@ -224,6 +227,9 @@ class XMLDecoderReadObject extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for XmlDecoderReadObject */
+deprecated class XMLDecoderReadObject = XmlDecoderReadObject;
+
 private predicate constantStringExpr(Expr e, string val) {
   e.(CompileTimeConstantExpr).getStringValue() = val
   or
@@ -235,8 +241,8 @@ private predicate constantStringExpr(Expr e, string val) {
 }
 
 /** A call to `SAXTransformerFactory.newTransformerHandler`. */
-class SAXTransformerFactoryNewTransformerHandler extends XmlParserCall {
-  SAXTransformerFactoryNewTransformerHandler() {
+class SaxTransformerFactoryNewTransformerHandler extends XmlParserCall {
+  SaxTransformerFactoryNewTransformerHandler() {
     exists(Method m |
       this.getMethod() = m and
       m.getDeclaringType().hasQualifiedName("javax.xml.transform.sax", "SAXTransformerFactory") and
@@ -251,6 +257,10 @@ class SAXTransformerFactoryNewTransformerHandler extends XmlParserCall {
   }
 }
 
+/** DEPRECATED: Alias for SaxTransformerFactoryNewTransformerHandler */
+deprecated class SAXTransformerFactoryNewTransformerHandler =
+  SaxTransformerFactoryNewTransformerHandler;
+
 /** An expression that always has the same string value. */
 private class ConstantStringExpr extends Expr {
   string value;
diff --git a/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql b/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
index 42213de55f6..bea7faff694 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
@@ -36,16 +36,6 @@ class MessageDigest extends RefType {
   MessageDigest() { this.hasQualifiedName("java.security", "MessageDigest") }
 }
 
-/** The method call `MessageDigest.getInstance(...)` */
-class MDConstructor extends StaticMethodAccess {
-  MDConstructor() {
-    exists(Method m | m = this.getMethod() |
-      m.getDeclaringType() instanceof MessageDigest and
-      m.hasName("getInstance")
-    )
-  }
-}
-
 /** The method `digest()` declared in `java.security.MessageDigest`. */
 class MDDigestMethod extends Method {
   MDDigestMethod() {
diff --git a/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll b/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll
index 9e76410a6ff..aba7bba5238 100644
--- a/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll
+++ b/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll
@@ -102,7 +102,7 @@ private class BlockListBarrierGuard extends PathTraversalBarrierGuard instanceof
  * A guard that considers a string safe because it is checked for URL encoding sequences,
  * having previously been checked against a block-list of forbidden values.
  */
-private class URLEncodingBarrierGuard extends PathTraversalBarrierGuard instanceof UrlEncodingGuard {
+private class UrlEncodingBarrierGuard extends PathTraversalBarrierGuard instanceof UrlEncodingGuard {
   override predicate checks(Expr e, boolean branch) {
     e = super.getCheckedExpr() and
     branch = false and
diff --git a/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll b/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll
index 00580fe1e79..709a05dae0d 100644
--- a/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll
+++ b/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll
@@ -3,18 +3,21 @@ import java
 /**
  * A deployment descriptor file, typically called `struts.xml`.
  */
-class StrutsXMLFile extends XMLFile {
-  StrutsXMLFile() {
+class StrutsXmlFile extends XMLFile {
+  StrutsXmlFile() {
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "struts"
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlFile */
+deprecated class StrutsXMLFile = StrutsXmlFile;
+
 /**
  * An XML element in a `StrutsXMLFile`.
  */
-class StrutsXMLElement extends XMLElement {
-  StrutsXMLElement() { this.getFile() instanceof StrutsXMLFile }
+class StrutsXmlElement extends XMLElement {
+  StrutsXmlElement() { this.getFile() instanceof StrutsXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -22,10 +25,13 @@ class StrutsXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for StrutsXmlElement */
+deprecated class StrutsXMLElement = StrutsXmlElement;
+
 /**
  * A `<constant>` element in a `StrutsXMLFile`.
  */
-class ConstantParameter extends StrutsXMLElement {
+class ConstantParameter extends StrutsXmlElement {
   ConstantParameter() { this.getName() = "constant" }
 
   /**
diff --git a/java/ql/src/meta/ssa/AmbiguousToString.ql b/java/ql/src/meta/ssa/AmbiguousToString.ql
index ef9439705de..817685cf609 100644
--- a/java/ql/src/meta/ssa/AmbiguousToString.ql
+++ b/java/ql/src/meta/ssa/AmbiguousToString.ql
@@ -22,6 +22,6 @@ where
     or
     multipleToString(ssa) and problem = "SSA variable with multiple 'toString()' results for "
   ) and
-  n = ssa.getCFGNode() and
+  n = ssa.getCfgNode() and
   v = ssa.getSourceVariable().getVariable()
 select n, problem + v
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 4be8ebddff7..b27efa16aca 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: 
   - java
   - queries
diff --git a/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll b/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll
index 5eff757a93d..856729dcce5 100644
--- a/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll
+++ b/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll
@@ -7,18 +7,21 @@ import java
 /**
  * MyBatis Mapper XML file.
  */
-class MyBatisMapperXMLFile extends XMLFile {
-  MyBatisMapperXMLFile() {
+class MyBatisMapperXmlFile extends XMLFile {
+  MyBatisMapperXmlFile() {
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "mapper"
   }
 }
 
+/** DEPRECATED: Alias for MyBatisMapperXmlFile */
+deprecated class MyBatisMapperXMLFile = MyBatisMapperXmlFile;
+
 /**
  * An XML element in a `MyBatisMapperXMLFile`.
  */
-class MyBatisMapperXMLElement extends XMLElement {
-  MyBatisMapperXMLElement() { this.getFile() instanceof MyBatisMapperXMLFile }
+class MyBatisMapperXmlElement extends XMLElement {
+  MyBatisMapperXmlElement() { this.getFile() instanceof MyBatisMapperXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -33,10 +36,13 @@ class MyBatisMapperXMLElement extends XMLElement {
   }
 }
 
+/** DEPRECATED: Alias for MyBatisMapperXmlElement */
+deprecated class MyBatisMapperXMLElement = MyBatisMapperXmlElement;
+
 /**
  * An MyBatis Mapper sql operation element.
  */
-abstract class MyBatisMapperSqlOperation extends MyBatisMapperXMLElement {
+abstract class MyBatisMapperSqlOperation extends MyBatisMapperXmlElement {
   /**
    * Gets the value of the `id` attribute of MyBatis Mapper sql operation element.
    */
@@ -52,7 +58,7 @@ abstract class MyBatisMapperSqlOperation extends MyBatisMapperXMLElement {
    */
   Method getMapperMethod() {
     result.getName() = this.getId() and
-    result.getDeclaringType() = this.getParent().(MyBatisMapperXMLElement).getNamespaceRefType()
+    result.getDeclaringType() = this.getParent().(MyBatisMapperXmlElement).getNamespaceRefType()
   }
 }
 
@@ -87,7 +93,7 @@ class MyBatisMapperSelect extends MyBatisMapperSqlOperation {
 /**
  * A `<sql>` element in a `MyBatisMapperXMLElement`.
  */
-class MyBatisMapperSql extends MyBatisMapperXMLElement {
+class MyBatisMapperSql extends MyBatisMapperXmlElement {
   MyBatisMapperSql() { this.getName() = "sql" }
 
   /**
@@ -99,7 +105,7 @@ class MyBatisMapperSql extends MyBatisMapperXMLElement {
 /**
  * A `<include>` element in a `MyBatisMapperXMLElement`.
  */
-class MyBatisMapperInclude extends MyBatisMapperXMLElement {
+class MyBatisMapperInclude extends MyBatisMapperXmlElement {
   MyBatisMapperInclude() { this.getName() = "include" }
 
   /**
@@ -111,6 +117,6 @@ class MyBatisMapperInclude extends MyBatisMapperXMLElement {
 /**
  * A `<foreach>` element in a `MyBatisMapperXMLElement`.
  */
-class MyBatisMapperForeach extends MyBatisMapperXMLElement {
+class MyBatisMapperForeach extends MyBatisMapperXmlElement {
   MyBatisMapperForeach() { this.getName() = "foreach" }
 }
diff --git a/java/ql/src/utils/model-generator/CaptureSinkModels.ql b/java/ql/src/utils/model-generator/CaptureSinkModels.ql
index aab52da3058..9f574cf84c9 100644
--- a/java/ql/src/utils/model-generator/CaptureSinkModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSinkModels.ql
@@ -43,7 +43,7 @@ string asInputArgument(DataFlow::Node source) {
   result = "Argument[-1]"
 }
 
-string captureSink(TargetAPI api) {
+string captureSink(TargetApi api) {
   exists(DataFlow::Node src, DataFlow::Node sink, PropagateToSinkConfiguration config, string kind |
     config.hasFlow(src, sink) and
     sinkNode(sink, kind) and
@@ -53,6 +53,6 @@ string captureSink(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string sink
+from TargetApi api, string sink
 where sink = captureSink(api)
 select sink order by sink
diff --git a/java/ql/src/utils/model-generator/CaptureSourceModels.ql b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
index 7cb9d2f19b3..e36ba324068 100644
--- a/java/ql/src/utils/model-generator/CaptureSourceModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
@@ -22,7 +22,7 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
   override predicate isSource(DataFlow::Node source) { sourceNode(source, _) }
 
   override predicate isSink(DataFlow::Node sink) {
-    exists(TargetAPI c |
+    exists(TargetApi c |
       sink instanceof ReturnNodeExt and
       sink.getEnclosingCallable() = c and
       c.isPublic() and
@@ -39,7 +39,7 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
   }
 }
 
-string captureSource(TargetAPI api) {
+string captureSource(TargetApi api) {
   exists(DataFlow::Node source, DataFlow::Node sink, FromSourceConfiguration config, string kind |
     config.hasFlow(source, sink) and
     sourceNode(source, kind) and
@@ -48,6 +48,6 @@ string captureSource(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string sink
+from TargetApi api, string sink
 where sink = captureSource(api)
 select sink order by sink
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
index 280e0a19d7d..69acd4ad5a9 100644
--- a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -4,23 +4,12 @@
  * @id java/utils/model-generator/summary-models
  */
 
-import java
-import semmle.code.java.dataflow.TaintTracking
-import semmle.code.java.dataflow.internal.DataFlowImplCommon
-import semmle.code.java.dataflow.internal.DataFlowNodes
-import semmle.code.java.dataflow.internal.DataFlowPrivate
-import semmle.code.java.dataflow.InstanceAccess
-import ModelGeneratorUtils
-
-string captureFlow(TargetAPI api) {
-  result = captureQualifierFlow(api) or
-  result = captureThroughFlow(api)
-}
+private import CaptureSummaryModels
 
 /**
  * Capture fluent APIs that return `this`.
  * Example of a fluent API:
- * ```
+ * ```java
  * public class Foo {
  *   public Foo someAPI() {
  *    // some side-effect
@@ -28,75 +17,14 @@ string captureFlow(TargetAPI api) {
  *  }
  * }
  * ```
- */
-string captureQualifierFlow(TargetAPI api) {
-  exists(ReturnStmt rtn |
-    rtn.getEnclosingCallable() = api and
-    rtn.getResult().(ThisAccess).isOwnInstanceAccess()
-  ) and
-  result = asValueModel(api, "Argument[-1]", "ReturnValue")
-}
-
-class TaintRead extends DataFlow::FlowState {
-  TaintRead() { this = "TaintRead" }
-}
-
-class TaintStore extends DataFlow::FlowState {
-  TaintStore() { this = "TaintStore" }
-}
-
-class ThroughFlowConfig extends TaintTracking::Configuration {
-  ThroughFlowConfig() { this = "ThroughFlowConfig" }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
-    source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof TargetAPI and
-    state instanceof TaintRead
-  }
-
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-    sink instanceof ReturnNodeExt and
-    not sink.(ReturnNode).asExpr().(ThisAccess).isOwnInstanceAccess() and
-    not exists(captureQualifierFlow(sink.asExpr().getEnclosingCallable())) and
-    (state instanceof TaintRead or state instanceof TaintStore)
-  }
-
-  override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    exists(TypedContent tc |
-      store(node1, tc, node2, _) and
-      isRelevantContent(tc.getContent()) and
-      (state1 instanceof TaintRead or state1 instanceof TaintStore) and
-      state2 instanceof TaintStore
-    )
-    or
-    exists(DataFlow::Content c |
-      readStep(node1, c, node2) and
-      isRelevantContent(c) and
-      state1 instanceof TaintRead and
-      state2 instanceof TaintRead
-    )
-  }
-
-  override predicate isSanitizer(DataFlow::Node n) {
-    exists(Type t | t = n.getType() and not isRelevantType(t))
-  }
-
-  override DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
-  }
-}
-
-/**
+ *
  * Capture APIs that transfer taint from an input parameter to an output return
  * value or parameter.
  * Allows a sequence of read steps followed by a sequence of store steps.
  *
  * Examples:
  *
- * ```
+ * ```java
  * public class Foo {
  *   private String tainted;
  *
@@ -109,13 +37,13 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
  *   }
  * }
  * ```
- * Captured Model:
+ * Captured Models:
  * ```
  * p;Foo;true;returnsTainted;;Argument[-1];ReturnValue;taint
  * p;Foo;true;putsTaintIntoParameter;(List);Argument[-1];Argument[0];taint
  * ```
  *
- * ```
+ * ```java
  * public class Foo {
  *  private String tainted;
  *  public void doSomething(String input) {
@@ -123,9 +51,9 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
  *  }
  * ```
  * Captured Model:
- * `p;Foo;true;doSomething;(String);Argument[0];Argument[-1];taint`
+ * ```p;Foo;true;doSomething;(String);Argument[0];Argument[-1];taint```
  *
- * ```
+ * ```java
  * public class Foo {
  *   public String returnData(String tainted) {
  *     return tainted.substring(0,10)
@@ -133,9 +61,9 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
  * }
  * ```
  * Captured Model:
- * `p;Foo;true;returnData;;Argument[0];ReturnValue;taint`
+ * ```p;Foo;true;returnData;;Argument[0];ReturnValue;taint```
  *
- * ```
+ * ```java
  * public class Foo {
  *   public void addToList(String tainted, List<String> foo) {
  *     foo.add(tainted);
@@ -143,22 +71,13 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
  * }
  * ```
  * Captured Model:
- * `p;Foo;true;addToList;;Argument[0];Argument[1];taint`
+ * ```p;Foo;true;addToList;;Argument[0];Argument[1];taint```
  */
-string captureThroughFlow(TargetAPI api) {
-  exists(
-    ThroughFlowConfig config, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input,
-    string output
-  |
-    config.hasFlow(p, returnNodeExt) and
-    returnNodeExt.getEnclosingCallable() = api and
-    input = parameterNodeAsInput(p) and
-    output = returnNodeAsOutput(returnNodeExt) and
-    input != output and
-    result = asTaintModel(api, input, output)
-  )
+string captureFlow(TargetApi api) {
+  result = captureQualifierFlow(api) or
+  result = captureThroughFlow(api)
 }
 
-from TargetAPI api, string flow
+from TargetApi api, string flow
 where flow = captureFlow(api)
 select flow order by flow
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.qll b/java/ql/src/utils/model-generator/CaptureSummaryModels.qll
new file mode 100644
index 00000000000..1c7df39d97f
--- /dev/null
+++ b/java/ql/src/utils/model-generator/CaptureSummaryModels.qll
@@ -0,0 +1,98 @@
+/**
+ * Provides classes and predicates related to capturing summary models
+ * of the Standard or a 3rd party library.
+ */
+
+import CaptureSummaryModelsSpecific
+
+/**
+ * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
+ */
+string captureQualifierFlow(TargetApi api) {
+  exists(ReturnNodeExt ret |
+    api = returnNodeEnclosingCallable(ret) and
+    isOwnInstanceAccessNode(ret)
+  ) and
+  result = asValueModel(api, qualifierString(), "ReturnValue")
+}
+
+/**
+ * A FlowState representing a tainted read.
+ */
+private class TaintRead extends DataFlow::FlowState {
+  TaintRead() { this = "TaintRead" }
+}
+
+/**
+ * A FlowState representing a tainted write.
+ */
+private class TaintStore extends DataFlow::FlowState {
+  TaintStore() { this = "TaintStore" }
+}
+
+/**
+ * A TaintTracking Configuration used for tracking flow through APIs.
+ * The sources are the parameters of an API and the sinks are the return values (excluding `this`) and parameters.
+ *
+ * This can be used to generate Flow summaries for APIs from parameter to return.
+ */
+class ThroughFlowConfig extends TaintTracking::Configuration {
+  ThroughFlowConfig() { this = "ThroughFlowConfig" }
+
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
+    source instanceof DataFlow::ParameterNode and
+    source.getEnclosingCallable() instanceof TargetApi and
+    state instanceof TaintRead
+  }
+
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
+    sink instanceof ReturnNodeExt and
+    not isOwnInstanceAccessNode(sink) and
+    not exists(captureQualifierFlow(sink.asExpr().getEnclosingCallable())) and
+    (state instanceof TaintRead or state instanceof TaintStore)
+  }
+
+  override predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    exists(TypedContent tc |
+      store(node1, tc, node2, _) and
+      isRelevantContent(tc.getContent()) and
+      (state1 instanceof TaintRead or state1 instanceof TaintStore) and
+      state2 instanceof TaintStore
+    )
+    or
+    exists(DataFlow::Content c |
+      readStep(node1, c, node2) and
+      isRelevantContent(c) and
+      state1 instanceof TaintRead and
+      state2 instanceof TaintRead
+    )
+  }
+
+  override predicate isSanitizer(DataFlow::Node n) {
+    exists(Type t | t = n.getType() and not isRelevantType(t))
+  }
+
+  override DataFlow::FlowFeature getAFeature() {
+    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
+  }
+}
+
+/**
+ * Gets the summary model(s) of `api`, if there is flow from parameters to return value or parameter.
+ */
+string captureThroughFlow(TargetApi api) {
+  exists(
+    ThroughFlowConfig config, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input,
+    string output
+  |
+    config.hasFlow(p, returnNodeExt) and
+    returnNodeExt.getEnclosingCallable() = api and
+    input = parameterNodeAsInput(p) and
+    output = returnNodeAsOutput(returnNodeExt) and
+    input != output and
+    result = asTaintModel(api, input, output)
+  )
+}
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll b/java/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll
new file mode 100644
index 00000000000..8a57fde63f9
--- /dev/null
+++ b/java/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll
@@ -0,0 +1,21 @@
+/**
+ * Provides predicates related to capturing summary models of the Standard or a 3rd party library.
+ */
+
+import java
+import semmle.code.java.dataflow.TaintTracking
+import semmle.code.java.dataflow.internal.DataFlowImplCommon
+import semmle.code.java.dataflow.internal.DataFlowNodes
+import semmle.code.java.dataflow.internal.DataFlowPrivate
+import semmle.code.java.dataflow.InstanceAccess
+import ModelGeneratorUtils
+
+Callable returnNodeEnclosingCallable(ReturnNodeExt ret) {
+  result = getNodeEnclosingCallable(ret).asCallable()
+}
+
+predicate isOwnInstanceAccessNode(ReturnNode node) {
+  node.asExpr().(ThisAccess).isOwnInstanceAccess()
+}
+
+string qualifierString() { result = "Argument[-1]" }
diff --git a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
index f990a2e2fad..05e3d6cbf38 100644
--- a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
+++ b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
@@ -1,140 +1,8 @@
-import java
-private import semmle.code.java.dataflow.ExternalFlow
-private import semmle.code.java.dataflow.internal.ContainerFlow
-private import semmle.code.java.dataflow.internal.DataFlowImplCommon
-private import semmle.code.java.dataflow.DataFlow
-private import semmle.code.java.dataflow.internal.DataFlowPrivate
-
-Method superImpl(Method m) {
-  result = m.getAnOverride() and
-  not exists(result.getAnOverride()) and
-  not m instanceof ToStringMethod
-}
-
-class TargetAPI extends Callable {
-  TargetAPI() {
-    this.isPublic() and
-    this.fromSource() and
-    (
-      this.getDeclaringType().isPublic() or
-      superImpl(this).getDeclaringType().isPublic()
-    ) and
-    isRelevantForModels(this)
-  }
-}
-
-private string isExtensible(RefType ref) {
-  if ref.isFinal() then result = "false" else result = "true"
-}
-
-predicate isRelevantForModels(Callable api) {
-  not isInTestFile(api.getCompilationUnit().getFile()) and
-  not isJdkInternal(api.getCompilationUnit()) and
-  not api instanceof MainMethod
-}
-
-private predicate isInTestFile(File file) {
-  file.getAbsolutePath().matches("%src/test/%") or
-  file.getAbsolutePath().matches("%/guava-tests/%") or
-  file.getAbsolutePath().matches("%/guava-testlib/%")
-}
-
-private predicate isJdkInternal(CompilationUnit cu) {
-  cu.getPackage().getName().matches("org.graalvm%") or
-  cu.getPackage().getName().matches("com.sun%") or
-  cu.getPackage().getName().matches("javax.swing%") or
-  cu.getPackage().getName().matches("java.awt%") or
-  cu.getPackage().getName().matches("sun%") or
-  cu.getPackage().getName().matches("jdk.%") or
-  cu.getPackage().getName().matches("java2d.%") or
-  cu.getPackage().getName().matches("build.tools.%") or
-  cu.getPackage().getName().matches("propertiesparser.%") or
-  cu.getPackage().getName().matches("org.jcp.%") or
-  cu.getPackage().getName().matches("org.w3c.%") or
-  cu.getPackage().getName().matches("org.ietf.jgss.%") or
-  cu.getPackage().getName().matches("org.xml.sax%") or
-  cu.getPackage().getName() = "compileproperties" or
-  cu.getPackage().getName() = "netscape.javascript" or
-  cu.getPackage().getName() = ""
-}
-
-bindingset[input, output]
-string asTaintModel(TargetAPI api, string input, string output) {
-  result = asSummaryModel(api, input, output, "taint")
-}
-
-bindingset[input, output]
-string asValueModel(TargetAPI api, string input, string output) {
-  result = asSummaryModel(api, input, output, "value")
-}
-
-bindingset[input, output, kind]
-string asSummaryModel(TargetAPI api, string input, string output, string kind) {
-  result =
-    asPartialModel(api) + input + ";" //
-      + output + ";" //
-      + kind
-}
-
-bindingset[input, kind]
-string asSinkModel(TargetAPI api, string input, string kind) {
-  result = asPartialModel(api) + input + ";" + kind
-}
-
-bindingset[output, kind]
-string asSourceModel(TargetAPI api, string output, string kind) {
-  result = asPartialModel(api) + output + ";" + kind
-}
+import ModelGeneratorUtilsSpecific
 
 /**
- * Computes the first 6 columns for CSV rows.
+ * Holds if data can flow from `node1` to `node2` either via a read or a write of an intermediate field `f`.
  */
-private string asPartialModel(TargetAPI api) {
-  result =
-    typeAsSummaryModel(api) + ";" //
-      + isExtensible(bestTypeForModel(api)) + ";" //
-      + api.getName() + ";" //
-      + paramsString(api) + ";" //
-      + /* ext + */ ";" //
-}
-
-/**
- * Returns the appropriate type name for the model. Either the type
- * declaring the method or the supertype introducing the method.
- */
-private string typeAsSummaryModel(TargetAPI api) { result = typeAsModel(bestTypeForModel(api)) }
-
-private RefType bestTypeForModel(TargetAPI api) {
-  if exists(superImpl(api))
-  then superImpl(api).fromSource() and result = superImpl(api).getDeclaringType()
-  else result = api.getDeclaringType()
-}
-
-private string typeAsModel(RefType type) {
-  result = type.getCompilationUnit().getPackage().getName() + ";" + type.nestedName()
-}
-
-predicate isRelevantType(Type t) {
-  not t instanceof TypeClass and
-  not t instanceof EnumType and
-  not t instanceof PrimitiveType and
-  not t instanceof BoxedType and
-  not t.(RefType).getAnAncestor().hasQualifiedName("java.lang", "Number") and
-  not t.(RefType).getAnAncestor().hasQualifiedName("java.nio.charset", "Charset") and
-  (
-    not t.(Array).getElementType() instanceof PrimitiveType or
-    isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
-  ) and
-  (
-    not t.(Array).getElementType() instanceof BoxedType or
-    isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
-  ) and
-  (
-    not t.(CollectionType).getElementType() instanceof BoxedType or
-    isPrimitiveTypeUsedForBulkData(t.(CollectionType).getElementType())
-  )
-}
-
 predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
   exists(DataFlow::Content f |
     readStep(node1, f, node2) and
@@ -146,50 +14,58 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
       else any()
   )
   or
-  exists(DataFlow::Content f | storeStep(node1, f, node2) |
-    f instanceof DataFlow::ArrayContent or
-    f instanceof DataFlow::CollectionContent or
-    f instanceof DataFlow::MapKeyContent or
-    f instanceof DataFlow::MapValueContent
-  )
+  exists(DataFlow::Content f | storeStep(node1, f, node2) | containerContent(f))
 }
 
-predicate isRelevantContent(DataFlow::Content f) {
-  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
-  f instanceof DataFlow::ArrayContent or
-  f instanceof DataFlow::CollectionContent or
-  f instanceof DataFlow::MapKeyContent or
-  f instanceof DataFlow::MapValueContent
+/**
+ * Holds if content `c` is either a field or synthetic field of a relevant type
+ * or a container like content.
+ */
+predicate isRelevantContent(DataFlow::Content c) {
+  isRelevantType(c.(DataFlow::FieldContent).getField().getType()) or
+  isRelevantType(c.(DataFlow::SyntheticFieldContent).getField().getType()) or
+  containerContent(c)
 }
 
-string parameterNodeAsInput(DataFlow::ParameterNode p) {
-  result = parameterAccess(p.asParameter())
-  or
-  result = "Argument[-1]" and p instanceof DataFlow::InstanceParameterNode
+/**
+ * Gets the summary model for `api` with `input`, `output` and `kind`.
+ */
+bindingset[input, output, kind]
+string asSummaryModel(TargetApi api, string input, string output, string kind) {
+  result =
+    asPartialModel(api) + input + ";" //
+      + output + ";" //
+      + kind
 }
 
-string returnNodeAsOutput(ReturnNodeExt node) {
-  if node.getKind() instanceof ValueReturnKind
-  then result = "ReturnValue"
-  else
-    exists(int pos | pos = node.getKind().(ParamUpdateReturnKind).getPosition() |
-      result = parameterAccess(node.getEnclosingCallable().getParameter(pos))
-      or
-      result = "Argument[-1]" and pos = -1
-    )
+/**
+ * Gets the value summary model for `api` with `input` and `output`.
+ */
+bindingset[input, output]
+string asValueModel(TargetApi api, string input, string output) {
+  result = asSummaryModel(api, input, output, "value")
 }
 
-string parameterAccess(Parameter p) {
-  if
-    p.getType() instanceof Array and
-    not isPrimitiveTypeUsedForBulkData(p.getType().(Array).getElementType())
-  then result = "Argument[" + p.getPosition() + "].ArrayElement"
-  else
-    if p.getType() instanceof ContainerType
-    then result = "Argument[" + p.getPosition() + "].Element"
-    else result = "Argument[" + p.getPosition() + "]"
+/**
+ * Gets the taint summary model for `api` with `input` and `output`.
+ */
+bindingset[input, output]
+string asTaintModel(TargetApi api, string input, string output) {
+  result = asSummaryModel(api, input, output, "taint")
 }
 
-predicate isPrimitiveTypeUsedForBulkData(Type t) {
-  t.getName().regexpMatch("byte|char|Byte|Character")
+/**
+ * Gets the sink model for `api` with `input` and `kind`.
+ */
+bindingset[input, kind]
+string asSinkModel(TargetApi api, string input, string kind) {
+  result = asPartialModel(api) + input + ";" + kind
+}
+
+/**
+ * Gets the source model for `api` with `output` and `kind`.
+ */
+bindingset[output, kind]
+string asSourceModel(TargetApi api, string output, string kind) {
+  result = asPartialModel(api) + output + ";" + kind
 }
diff --git a/java/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll b/java/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll
new file mode 100644
index 00000000000..6832f0773a9
--- /dev/null
+++ b/java/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll
@@ -0,0 +1,156 @@
+import java
+import semmle.code.java.dataflow.internal.DataFlowPrivate
+import semmle.code.java.dataflow.DataFlow
+private import semmle.code.java.dataflow.ExternalFlow
+private import semmle.code.java.dataflow.internal.ContainerFlow
+private import semmle.code.java.dataflow.internal.DataFlowImplCommon
+
+Method superImpl(Method m) {
+  result = m.getAnOverride() and
+  not exists(result.getAnOverride()) and
+  not m instanceof ToStringMethod
+}
+
+private predicate isInTestFile(File file) {
+  file.getAbsolutePath().matches("%src/test/%") or
+  file.getAbsolutePath().matches("%/guava-tests/%") or
+  file.getAbsolutePath().matches("%/guava-testlib/%")
+}
+
+private predicate isJdkInternal(CompilationUnit cu) {
+  cu.getPackage().getName().matches("org.graalvm%") or
+  cu.getPackage().getName().matches("com.sun%") or
+  cu.getPackage().getName().matches("javax.swing%") or
+  cu.getPackage().getName().matches("java.awt%") or
+  cu.getPackage().getName().matches("sun%") or
+  cu.getPackage().getName().matches("jdk.%") or
+  cu.getPackage().getName().matches("java2d.%") or
+  cu.getPackage().getName().matches("build.tools.%") or
+  cu.getPackage().getName().matches("propertiesparser.%") or
+  cu.getPackage().getName().matches("org.jcp.%") or
+  cu.getPackage().getName().matches("org.w3c.%") or
+  cu.getPackage().getName().matches("org.ietf.jgss.%") or
+  cu.getPackage().getName().matches("org.xml.sax%") or
+  cu.getPackage().getName() = "compileproperties" or
+  cu.getPackage().getName() = "netscape.javascript" or
+  cu.getPackage().getName() = ""
+}
+
+predicate isRelevantForModels(Callable api) {
+  not isInTestFile(api.getCompilationUnit().getFile()) and
+  not isJdkInternal(api.getCompilationUnit()) and
+  not api instanceof MainMethod
+}
+
+/**
+ * A class of Callables that are relevant for generating summary, source and sinks models for.
+ *
+ * In the Standard library and 3rd party libraries it the Callables that can be called
+ * from outside the library itself.
+ */
+class TargetApi extends Callable {
+  TargetApi() {
+    this.isPublic() and
+    this.fromSource() and
+    (
+      this.getDeclaringType().isPublic() or
+      superImpl(this).getDeclaringType().isPublic()
+    ) and
+    isRelevantForModels(this)
+  }
+}
+
+private string isExtensible(RefType ref) {
+  if ref.isFinal() then result = "false" else result = "true"
+}
+
+private string typeAsModel(RefType type) {
+  result = type.getCompilationUnit().getPackage().getName() + ";" + type.nestedName()
+}
+
+private RefType bestTypeForModel(TargetApi api) {
+  if exists(superImpl(api))
+  then superImpl(api).fromSource() and result = superImpl(api).getDeclaringType()
+  else result = api.getDeclaringType()
+}
+
+/**
+ * Returns the appropriate type name for the model. Either the type
+ * declaring the method or the supertype introducing the method.
+ */
+private string typeAsSummaryModel(TargetApi api) { result = typeAsModel(bestTypeForModel(api)) }
+
+/**
+ * Computes the first 6 columns for CSV rows.
+ */
+string asPartialModel(TargetApi api) {
+  result =
+    typeAsSummaryModel(api) + ";" //
+      + isExtensible(bestTypeForModel(api)) + ";" //
+      + api.getName() + ";" //
+      + paramsString(api) + ";" //
+      + /* ext + */ ";" //
+}
+
+private predicate isPrimitiveTypeUsedForBulkData(Type t) {
+  t.getName().regexpMatch("byte|char|Byte|Character")
+}
+
+/**
+ * Holds for type `t` for fields that are relevant as an intermediate
+ * read or write step in the data flow analysis.
+ */
+predicate isRelevantType(Type t) {
+  not t instanceof TypeClass and
+  not t instanceof EnumType and
+  not t instanceof PrimitiveType and
+  not t instanceof BoxedType and
+  not t.(RefType).getAnAncestor().hasQualifiedName("java.lang", "Number") and
+  not t.(RefType).getAnAncestor().hasQualifiedName("java.nio.charset", "Charset") and
+  (
+    not t.(Array).getElementType() instanceof PrimitiveType or
+    isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
+  ) and
+  (
+    not t.(Array).getElementType() instanceof BoxedType or
+    isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
+  ) and
+  (
+    not t.(CollectionType).getElementType() instanceof BoxedType or
+    isPrimitiveTypeUsedForBulkData(t.(CollectionType).getElementType())
+  )
+}
+
+private string parameterAccess(Parameter p) {
+  if
+    p.getType() instanceof Array and
+    not isPrimitiveTypeUsedForBulkData(p.getType().(Array).getElementType())
+  then result = "Argument[" + p.getPosition() + "].ArrayElement"
+  else
+    if p.getType() instanceof ContainerType
+    then result = "Argument[" + p.getPosition() + "].Element"
+    else result = "Argument[" + p.getPosition() + "]"
+}
+
+/**
+ * Gets the model string representation of the parameter node `p`.
+ */
+string parameterNodeAsInput(DataFlow::ParameterNode p) {
+  result = parameterAccess(p.asParameter())
+  or
+  result = "Argument[-1]" and p instanceof DataFlow::InstanceParameterNode
+}
+
+/**
+ * Gets the model string represention of the the return node `node`.
+ */
+string returnNodeAsOutput(ReturnNodeExt node) {
+  if node.getKind() instanceof ValueReturnKind
+  then result = "ReturnValue"
+  else
+    exists(int pos | pos = node.getKind().(ParamUpdateReturnKind).getPosition() |
+      result = parameterAccess(node.getEnclosingCallable().getParameter(pos))
+      or
+      result = "Argument[-1]" and pos = -1
+    )
+}
diff --git a/java/ql/test/TestUtilities/InlineExpectationsTest.qll b/java/ql/test/TestUtilities/InlineExpectationsTest.qll
index 7d605a491ee..a4d264b2703 100644
--- a/java/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/java/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -124,7 +124,9 @@ abstract class InlineExpectationsTest extends string {
   abstract predicate hasActualResult(Location location, string element, string tag, string value);
 
   /**
-   * Like `hasActualResult`, but returns results that do not require a matching annotation.
+   * Holds if there is an optional result on the specified location.
+   *
+   * This is similar to `hasActualResult`, but returns results that do not require a matching annotation.
    * A failure will still arise if there is an annotation that does not match any results, but not vice versa.
    * Override this predicate to specify optional results.
    */
diff --git a/java/ql/test/library-tests/constants/getBooleanValue.ql b/java/ql/test/library-tests/constants/getBooleanValue.ql
index 2b10d95ff9b..460af42d3c3 100644
--- a/java/ql/test/library-tests/constants/getBooleanValue.ql
+++ b/java/ql/test/library-tests/constants/getBooleanValue.ql
@@ -1,9 +1,9 @@
 import semmle.code.java.Variable
 
-from Variable v, Expr init, RefType enclosing, boolean constant
+from Variable v, CompileTimeConstantExpr init, RefType enclosing, boolean constant
 where
   v.getInitializer() = init and
   init.getEnclosingCallable().getDeclaringType() = enclosing and
   enclosing.hasQualifiedName("constants", "Values") and
-  constant = init.(CompileTimeConstantExpr).getBooleanValue()
+  constant = init.getBooleanValue()
 select init, constant
diff --git a/java/ql/test/library-tests/constants/getIntValue.ql b/java/ql/test/library-tests/constants/getIntValue.ql
index dbb2c5bd967..5fc5b108032 100644
--- a/java/ql/test/library-tests/constants/getIntValue.ql
+++ b/java/ql/test/library-tests/constants/getIntValue.ql
@@ -1,9 +1,9 @@
 import semmle.code.java.Variable
 
-from Variable v, Expr init, RefType enclosing, int constant
+from Variable v, CompileTimeConstantExpr init, RefType enclosing, int constant
 where
   v.getInitializer() = init and
   init.getEnclosingCallable().getDeclaringType() = enclosing and
   enclosing.hasQualifiedName("constants", "Values") and
-  constant = init.(CompileTimeConstantExpr).getIntValue()
+  constant = init.getIntValue()
 select init, constant
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql
index bc4916c217c..1b266b35ee5 100644
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql
@@ -55,7 +55,7 @@ class JaxRsTest extends InlineExpectationsTest {
     or
     tag = "ResourceMethodOnResourceClass" and
     exists(JaxRsResourceMethod resourceMethod |
-      resourceMethod = any(JaxRsResourceClass ResourceClass).getAResourceMethod()
+      resourceMethod = any(JaxRsResourceClass resourceClass).getAResourceMethod()
     |
       resourceMethod.getLocation() = location and
       element = resourceMethod.toString() and
diff --git a/java/ql/test/library-tests/ssa/ssaDef.ql b/java/ql/test/library-tests/ssa/ssaDef.ql
index 9f08ddc0c40..c487c539e78 100644
--- a/java/ql/test/library-tests/ssa/ssaDef.ql
+++ b/java/ql/test/library-tests/ssa/ssaDef.ql
@@ -9,4 +9,4 @@ where
     or
     not exists(ssa.toString()) and s = "error"
   )
-select v, ssa.getCFGNode(), s
+select v, ssa.getCfgNode(), s
diff --git a/java/ql/test/library-tests/ssa/ssaPhi.ql b/java/ql/test/library-tests/ssa/ssaPhi.ql
index 11fc2d8d595..8aa0942e90a 100644
--- a/java/ql/test/library-tests/ssa/ssaPhi.ql
+++ b/java/ql/test/library-tests/ssa/ssaPhi.ql
@@ -3,4 +3,4 @@ import semmle.code.java.dataflow.SSA
 
 from SsaPhiNode ssa, SsaSourceVariable v, SsaVariable phiInput
 where ssa.getAPhiInput() = phiInput and ssa.getSourceVariable() = v
-select v, ssa.getCFGNode(), phiInput.getCFGNode()
+select v, ssa.getCfgNode(), phiInput.getCfgNode()
diff --git a/java/ql/test/library-tests/ssa/ssaUse.ql b/java/ql/test/library-tests/ssa/ssaUse.ql
index 53414a88064..cab6f47c955 100644
--- a/java/ql/test/library-tests/ssa/ssaUse.ql
+++ b/java/ql/test/library-tests/ssa/ssaUse.ql
@@ -3,4 +3,4 @@ import semmle.code.java.dataflow.SSA
 
 from SsaVariable ssa, SsaSourceVariable v, Expr use
 where use = ssa.getAUse() and ssa.getSourceVariable() = v
-select v, ssa.getCFGNode(), ssa.toString(), use
+select v, ssa.getCfgNode(), ssa.toString(), use
diff --git a/java/ql/test/library-tests/structure/TypeGetCompilationUnit.ql b/java/ql/test/library-tests/structure/TypeGetCompilationUnit.ql
index f3a335b8fc0..c0143989b1e 100644
--- a/java/ql/test/library-tests/structure/TypeGetCompilationUnit.ql
+++ b/java/ql/test/library-tests/structure/TypeGetCompilationUnit.ql
@@ -2,8 +2,8 @@ import semmle.code.java.Type
 
 predicate typeIsInCU(Type tpe, CompilationUnit cu) { tpe.getCompilationUnit() = cu }
 
-from Type tpe, CompilationUnit Ajava
+from Type tpe, CompilationUnit aJava
 where
-  Ajava.hasName("A") and
-  typeIsInCU(tpe, Ajava)
+  aJava.hasName("A") and
+  typeIsInCU(tpe, aJava)
 select tpe
diff --git a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql
index 6bfde865e85..afb0f7ae3e1 100644
--- a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql
+++ b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql
@@ -3,8 +3,8 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import TestUtilities.InlineExpectationsTest
 
-class XSSConfig extends TaintTracking::Configuration {
-  XSSConfig() { this = "XSSConfig" }
+class XssConfig extends TaintTracking::Configuration {
+  XssConfig() { this = "XSSConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
@@ -24,7 +24,7 @@ class XssTest extends InlineExpectationsTest {
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "xss" and
-    exists(DataFlow::Node src, DataFlow::Node sink, XSSConfig conf | conf.hasFlow(src, sink) |
+    exists(DataFlow::Node src, DataFlow::Node sink, XssConfig conf | conf.hasFlow(src, sink) |
       sink.getLocation() = location and
       element = sink.toString() and
       value = ""
diff --git a/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.expected b/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql b/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql
new file mode 100644
index 00000000000..aac128a263d
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql
@@ -0,0 +1,11 @@
+import java
+import TestUtilities.InlineFlowTest
+import semmle.code.java.security.SensitiveLoggingQuery
+
+class HasFlowTest extends InlineFlowTest {
+  override DataFlow::Configuration getTaintFlowConfig() {
+    result instanceof SensitiveLoggerConfiguration
+  }
+
+  override DataFlow::Configuration getValueFlowConfig() { none() }
+}
diff --git a/java/ql/test/query-tests/security/CWE-532/Test.java b/java/ql/test/query-tests/security/CWE-532/Test.java
new file mode 100644
index 00000000000..d70355651a3
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-532/Test.java
@@ -0,0 +1,16 @@
+import org.apache.logging.log4j.Logger;
+
+class Test {
+    void test(String password) {
+        Logger logger = null;
+
+        logger.info("User's password is: " + password); // $ hasTaintFlow
+    }   
+
+    void test2(String authToken) {
+        Logger logger = null;
+
+        logger.error("Auth failed for: " + authToken); // $ hasTaintFlow 
+    }
+
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-532/options b/java/ql/test/query-tests/security/CWE-532/options
new file mode 100644
index 00000000000..01138ecc34b
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-532/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/apache-log4j-1.2.17:${testdir}/../../../stubs/apache-log4j-2.14.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/jboss-logging-3.4.2:${testdir}/../../../stubs/slf4j-2.0.0:${testdir}/../../../stubs/scijava-common-2.87.1:${testdir}/../../../stubs/flogger-0.7.1:${testdir}/../../../stubs/google-android-9.0.0
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-918/JdbcUrlSSRF.java b/java/ql/test/query-tests/security/CWE-918/JdbcUrlSSRF.java
new file mode 100644
index 00000000000..fa202ef0373
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-918/JdbcUrlSSRF.java
@@ -0,0 +1,91 @@
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.sql.DriverManager;
+import java.sql.Driver;
+import java.sql.SQLException;
+import java.io.IOException;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import java.util.*;
+import org.springframework.jdbc.datasource.*;
+import org.jdbi.v3.core.Jdbi;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+
+public class JdbcUrlSSRF extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+    
+        String jdbcUrl = request.getParameter("jdbcUrl");
+        Driver driver = new org.postgresql.Driver();
+        DataSourceBuilder dsBuilder = new DataSourceBuilder();
+        
+        try {
+            driver.connect(jdbcUrl, null); // $ SSRF
+
+            DriverManager.getConnection(jdbcUrl); // $ SSRF
+            DriverManager.getConnection(jdbcUrl, "user", "password"); // $ SSRF
+            DriverManager.getConnection(jdbcUrl, null); // $ SSRF
+
+            dsBuilder.url(jdbcUrl); // $ SSRF
+        }
+        catch(SQLException e) {}
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+    
+        String jdbcUrl = request.getParameter("jdbcUrl");
+        HikariConfig config = new HikariConfig();
+
+        config.setJdbcUrl(jdbcUrl); // $ SSRF
+        config.setUsername("database_username");
+        config.setPassword("database_password");
+
+        HikariDataSource ds = new HikariDataSource();
+        ds.setJdbcUrl(jdbcUrl); // $ SSRF
+
+        Properties props = new Properties();
+        props.setProperty("driverClassName", "org.postgresql.Driver");
+        props.setProperty("jdbcUrl", jdbcUrl);
+
+        HikariConfig config2 = new HikariConfig(props); // $ SSRF
+    }
+
+    protected void doPut(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        String jdbcUrl = request.getParameter("jdbcUrl");
+    
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+    
+        dataSource.setDriverClassName("org.postgresql.Driver");
+        dataSource.setUrl(jdbcUrl); // $ SSRF
+
+        DriverManagerDataSource dataSource2 = new DriverManagerDataSource(jdbcUrl); // $ SSRF
+        dataSource2.setDriverClassName("org.postgresql.Driver");
+
+        DriverManagerDataSource dataSource3 = new DriverManagerDataSource(jdbcUrl, "user", "pass"); // $ SSRF
+        dataSource3.setDriverClassName("org.postgresql.Driver");
+
+        DriverManagerDataSource dataSource4 = new DriverManagerDataSource(jdbcUrl, null); // $ SSRF
+        dataSource4.setDriverClassName("org.postgresql.Driver");
+    }
+
+    protected void doDelete(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        String jdbcUrl = request.getParameter("jdbcUrl");
+
+        Jdbi.create(jdbcUrl); // $ SSRF
+        Jdbi.create(jdbcUrl, null); // $ SSRF
+        Jdbi.create(jdbcUrl, "user", "pass"); // $ SSRF
+
+        Jdbi.open(jdbcUrl); // $ SSRF
+        Jdbi.open(jdbcUrl, null); // $ SSRF
+        Jdbi.open(jdbcUrl, "user", "pass"); // $ SSRF
+    }
+    
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-918/options b/java/ql/test/query-tests/security/CWE-918/options
index 87db9eacec3..5776b35fe9f 100644
--- a/java/ql/test/query-tests/security/CWE-918/options
+++ b/java/ql/test/query-tests/security/CWE-918/options
@@ -1,2 +1,2 @@
-//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/projectreactor-3.4.3/
+//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/
 
diff --git a/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariConfig.java b/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariConfig.java
new file mode 100644
index 00000000000..f8ae9aaccb9
--- /dev/null
+++ b/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariConfig.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2013, 2014 Brett Wooldridge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.zaxxer.hikari;
+
+
+public class HikariConfig implements HikariConfigMXBean {
+
+    private String jdbcUrl;
+
+    public HikariConfig() {
+    }
+
+    public HikariConfig(java.util.Properties properties) {
+
+    }
+
+    public HikariConfig(String propertyFileName) {
+    }
+
+    public String getJdbcUrl() {
+       return jdbcUrl;
+    }
+ 
+    public void setJdbcUrl(String jdbcUrl) {
+       this.jdbcUrl = jdbcUrl;
+    }
+
+    public long getConnectionTimeout() { return 0; }
+
+    public void setConnectionTimeout(long connectionTimeoutMs) {}
+
+    public long getValidationTimeout() { return 0; }
+
+    public void setValidationTimeout(long validationTimeoutMs) {}
+
+    public long getIdleTimeout() { return 0; }
+
+    public void setIdleTimeout(long idleTimeoutMs) {}
+ 
+    public long getLeakDetectionThreshold() { return 0; }
+
+    public void setLeakDetectionThreshold(long leakDetectionThresholdMs) {}
+
+    public long getMaxLifetime() { return 0; }
+
+    public void setMaxLifetime(long maxLifetimeMs) {}
+
+    public int getMinimumIdle() { return 0; }
+
+    public void setMinimumIdle(int minIdle) {}
+
+    public int getMaximumPoolSize() { return 0; }
+ 
+    public void setMaximumPoolSize(int maxPoolSize) {}
+ 
+    public void setPassword(String password) {}
+ 
+    public void setUsername(String username) {}
+ 
+    public String getPoolName() {return "";}
+ 
+    public String getCatalog() {return "";}
+ 
+    public void setCatalog(String catalog) {}
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariConfigMXBean.java b/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariConfigMXBean.java
new file mode 100644
index 00000000000..2e510d53360
--- /dev/null
+++ b/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariConfigMXBean.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2013 Brett Wooldridge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.zaxxer.hikari;
+
+/**
+ * The javax.management MBean for a Hikari pool configuration.
+ *
+ * @author Brett Wooldridge
+ */
+public interface HikariConfigMXBean
+{
+   /**
+    * Get the maximum number of milliseconds that a client will wait for a connection from the pool. If this
+    * time is exceeded without a connection becoming available, a SQLException will be thrown from
+    * {@link javax.sql.DataSource#getConnection()}.
+    *
+    * @return the connection timeout in milliseconds
+    */
+   long getConnectionTimeout();
+
+   /**
+    * Set the maximum number of milliseconds that a client will wait for a connection from the pool. If this
+    * time is exceeded without a connection becoming available, a SQLException will be thrown from
+    * {@link javax.sql.DataSource#getConnection()}.
+    *
+    * @param connectionTimeoutMs the connection timeout in milliseconds
+    */
+   void setConnectionTimeout(long connectionTimeoutMs);
+
+   /**
+    * Get the maximum number of milliseconds that the pool will wait for a connection to be validated as
+    * alive.
+    *
+    * @return the validation timeout in milliseconds
+    */
+   long getValidationTimeout();
+
+   /**
+    * Sets the maximum number of milliseconds that the pool will wait for a connection to be validated as
+    * alive.
+    *
+    * @param validationTimeoutMs the validation timeout in milliseconds
+    */
+   void setValidationTimeout(long validationTimeoutMs);
+
+   /**
+    * This property controls the maximum amount of time (in milliseconds) that a connection is allowed to sit
+    * idle in the pool. Whether a connection is retired as idle or not is subject to a maximum variation of +30
+    * seconds, and average variation of +15 seconds. A connection will never be retired as idle before this timeout.
+    * A value of 0 means that idle connections are never removed from the pool.
+    *
+    * @return the idle timeout in milliseconds
+    */
+   long getIdleTimeout();
+
+   /**
+    * This property controls the maximum amount of time (in milliseconds) that a connection is allowed to sit
+    * idle in the pool. Whether a connection is retired as idle or not is subject to a maximum variation of +30
+    * seconds, and average variation of +15 seconds. A connection will never be retired as idle before this timeout.
+    * A value of 0 means that idle connections are never removed from the pool.
+    *
+    * @param idleTimeoutMs the idle timeout in milliseconds
+    */
+   void setIdleTimeout(long idleTimeoutMs);
+
+   /**
+    * This property controls the amount of time that a connection can be out of the pool before a message is
+    * logged indicating a possible connection leak. A value of 0 means leak detection is disabled.
+    *
+    * @return the connection leak detection threshold in milliseconds
+    */
+   long getLeakDetectionThreshold();
+
+   /**
+    * This property controls the amount of time that a connection can be out of the pool before a message is
+    * logged indicating a possible connection leak. A value of 0 means leak detection is disabled.
+    *
+    * @param leakDetectionThresholdMs the connection leak detection threshold in milliseconds
+    */
+   void setLeakDetectionThreshold(long leakDetectionThresholdMs);
+
+   /**
+    * This property controls the maximum lifetime of a connection in the pool. When a connection reaches this
+    * timeout, even if recently used, it will be retired from the pool. An in-use connection will never be
+    * retired, only when it is idle will it be removed.
+    *
+    * @return the maximum connection lifetime in milliseconds
+    */
+   long getMaxLifetime();
+
+   /**
+    * This property controls the maximum lifetime of a connection in the pool. When a connection reaches this
+    * timeout, even if recently used, it will be retired from the pool. An in-use connection will never be
+    * retired, only when it is idle will it be removed.
+    *
+    * @param maxLifetimeMs the maximum connection lifetime in milliseconds
+    */
+   void setMaxLifetime(long maxLifetimeMs);
+
+   /**
+    * The property controls the minimum number of idle connections that HikariCP tries to maintain in the pool,
+    * including both idle and in-use connections. If the idle connections dip below this value, HikariCP will
+    * make a best effort to restore them quickly and efficiently.
+    *
+    * @return the minimum number of connections in the pool
+    */
+   int getMinimumIdle();
+
+   /**
+    * The property controls the minimum number of idle connections that HikariCP tries to maintain in the pool,
+    * including both idle and in-use connections. If the idle connections dip below this value, HikariCP will
+    * make a best effort to restore them quickly and efficiently.
+    *
+    * @param minIdle the minimum number of idle connections in the pool to maintain
+    */
+   void setMinimumIdle(int minIdle);
+
+   /**
+    * The property controls the maximum number of connections that HikariCP will keep in the pool,
+    * including both idle and in-use connections.
+    *
+    * @return the maximum number of connections in the pool
+    */
+   int getMaximumPoolSize();
+
+   /**
+    * The property controls the maximum size that the pool is allowed to reach, including both idle and in-use
+    * connections. Basically this value will determine the maximum number of actual connections to the database
+    * backend.
+    * <p>
+    * When the pool reaches this size, and no idle connections are available, calls to getConnection() will
+    * block for up to connectionTimeout milliseconds before timing out.
+    *
+    * @param maxPoolSize the maximum number of connections in the pool
+    */
+   void setMaximumPoolSize(int maxPoolSize);
+
+   /**
+    * Set the password used for authentication. Changing this at runtime will apply to new connections only.
+    * Altering this at runtime only works for DataSource-based connections, not Driver-class or JDBC URL-based
+    * connections.
+    *
+    * @param password the database password
+    */
+   void setPassword(String password);
+
+   /**
+    * Set the username used for authentication. Changing this at runtime will apply to new connections only.
+    * Altering this at runtime only works for DataSource-based connections, not Driver-class or JDBC URL-based
+    * connections.
+    *
+    * @param username the database username
+    */
+   void setUsername(String username);
+
+
+   /**
+    * The name of the connection pool.
+    *
+    * @return the name of the connection pool
+    */
+   String getPoolName();
+
+   /**
+    * Get the default catalog name to be set on connections.
+    *
+    * @return the default catalog name
+    */
+   String getCatalog();
+
+   /**
+    * Set the default catalog name to be set on connections.
+    * <p>
+    * WARNING: THIS VALUE SHOULD ONLY BE CHANGED WHILE THE POOL IS SUSPENDED, AFTER CONNECTIONS HAVE BEEN EVICTED.
+    *
+    * @param catalog the catalog name, or null
+    */
+   void setCatalog(String catalog);
+}
diff --git a/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariDataSource.java b/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariDataSource.java
new file mode 100644
index 00000000000..2823f6dc3ce
--- /dev/null
+++ b/java/ql/test/stubs/HikariCP-3.4.5/com/zaxxer/hikari/HikariDataSource.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 Brett Wooldridge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.zaxxer.hikari;
+
+import javax.sql.DataSource;
+import java.io.Closeable;
+import java.sql.*;
+import java.util.logging.Logger;
+
+
+public class HikariDataSource extends HikariConfig implements DataSource, Closeable {
+
+    public HikariDataSource() {
+    }
+ 
+    public HikariDataSource(HikariConfig configuration) {
+    }
+
+    public Connection getConnection() throws SQLException {
+        return null;
+    }
+
+    public Connection getConnection(String username, String password)
+      throws SQLException {
+        return null;
+    }
+
+    public java.io.PrintWriter getLogWriter() throws SQLException {
+        return null;
+    }
+
+    public void setLogWriter(java.io.PrintWriter out) throws SQLException {
+    }
+
+    public void setLoginTimeout(int seconds) throws SQLException {
+    }
+
+    public int getLoginTimeout() throws SQLException {
+        return 0;
+    }
+
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+
+    public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
+        return null;
+    }
+
+    public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
+        return true;
+    }
+
+    public void close() {
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/Handle.java b/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/Handle.java
new file mode 100644
index 00000000000..f6183d30603
--- /dev/null
+++ b/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/Handle.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jdbi.v3.core;
+
+import java.io.Closeable;
+import java.sql.Connection;
+import org.jdbi.v3.core.config.Configurable;
+
+
+/**
+ * This represents a connection to the database system. It is a wrapper around
+ * a JDBC Connection object.  Handle provides essential methods for transaction
+ * management, statement creation, and other operations tied to the database session.
+ */
+public class Handle implements Closeable, Configurable<Handle> {
+
+    public void close() {
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/Jdbi.java b/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/Jdbi.java
new file mode 100644
index 00000000000..ca7d10180c0
--- /dev/null
+++ b/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/Jdbi.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jdbi.v3.core;
+
+import org.jdbi.v3.core.config.Configurable;
+import java.util.Properties;
+
+public class Jdbi implements Configurable<Jdbi> {
+
+    public static Jdbi create(final String url) {
+        return null;
+    }
+
+    /**
+     * Creates a new {@link Jdbi} instance from a database URL.
+     *
+     * @param url   JDBC URL for connections
+     * @param properties Properties to pass to DriverManager.getConnection(url, props) for each new handle
+     *
+     * @return a Jdbi which uses {@link DriverManager} as a connection factory.
+     */
+    public static Jdbi create(final String url, final Properties properties) {
+        return null;
+    }
+
+    /**
+     * Creates a new {@link Jdbi} instance from a database URL.
+     *
+     * @param url      JDBC URL for connections
+     * @param username User name for connection authentication
+     * @param password Password for connection authentication
+     *
+     * @return a Jdbi which uses {@link DriverManager} as a connection factory.
+     */
+    public static Jdbi create(final String url, final String username, final String password) {
+        return null;
+    }
+
+    public static Handle open(final String url) {
+        return null;
+    }
+
+    /**
+     * Obtain a handle with just a JDBC URL
+     *
+     * @param url      JDBC Url
+     * @param username JDBC username for authentication
+     * @param password JDBC password for authentication
+     *
+     * @return newly opened Handle
+     */
+    public static Handle open(final String url, final String username, final String password) {
+        return null;
+    }
+
+    /**
+     * Obtain a handle with just a JDBC URL
+     *
+     * @param url   JDBC Url
+     * @param props JDBC properties
+     *
+     * @return newly opened Handle
+     */
+    public static Handle open(final String url, final Properties props) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/config/Configurable.java b/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/config/Configurable.java
new file mode 100644
index 00000000000..ae3f5ebf6bc
--- /dev/null
+++ b/java/ql/test/stubs/jdbi3-core-3.27.2/org/jdbi/v3/core/config/Configurable.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jdbi.v3.core.config;
+
+
+/**
+ * A type with access to access and modify arbitrary Jdbi configuration.
+ *
+ * @param <This> The subtype that implements this interface.
+ */
+public interface Configurable<This> {
+}
+
diff --git a/java/ql/test/stubs/postgresql-42.3.3/org/postgresql/Driver.java b/java/ql/test/stubs/postgresql-42.3.3/org/postgresql/Driver.java
new file mode 100644
index 00000000000..e84ba28d55e
--- /dev/null
+++ b/java/ql/test/stubs/postgresql-42.3.3/org/postgresql/Driver.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+package org.postgresql;
+
+import java.util.logging.Logger;
+import java.sql.*;
+
+public class Driver implements java.sql.Driver {
+
+    public Connection connect(String url, java.util.Properties info) throws SQLException {
+        return null;
+    }
+
+    public boolean acceptsURL(String url) throws SQLException {
+        return true;
+    }
+
+    public DriverPropertyInfo[] getPropertyInfo(String url, java.util.Properties info)
+                     throws SQLException {
+        return null;
+    }
+
+    public int getMajorVersion() {
+        return 0;
+    }
+
+    public int getMinorVersion() {
+        return 0;
+    }
+
+
+    public boolean jdbcCompliant() {
+        return true;
+    }
+
+
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+}
diff --git a/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/AbstractDataSource.java b/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/AbstractDataSource.java
new file mode 100644
index 00000000000..5645c259de3
--- /dev/null
+++ b/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/AbstractDataSource.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2002-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jdbc.datasource;
+
+import java.io.PrintWriter;
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+import javax.sql.DataSource;
+
+public abstract class AbstractDataSource implements DataSource {
+
+
+	/**
+	 * Returns 0, indicating the default system timeout is to be used.
+	 */
+	@Override
+	public int getLoginTimeout() throws SQLException {
+		return 0;
+	}
+
+	/**
+	 * Setting a login timeout is not supported.
+	 */
+	@Override
+	public void setLoginTimeout(int timeout) throws SQLException {
+		throw new UnsupportedOperationException("setLoginTimeout");
+	}
+
+	/**
+	 * LogWriter methods are not supported.
+	 */
+	@Override
+	public PrintWriter getLogWriter() {
+		throw new UnsupportedOperationException("getLogWriter");
+	}
+
+	/**
+	 * LogWriter methods are not supported.
+	 */
+	@Override
+	public void setLogWriter(PrintWriter pw) throws SQLException {
+		throw new UnsupportedOperationException("setLogWriter");
+	}
+
+
+	//---------------------------------------------------------------------
+	// Implementation of JDBC 4.0's Wrapper interface
+	//---------------------------------------------------------------------
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> T unwrap(Class<T> iface) throws SQLException {
+		if (iface.isInstance(this)) {
+			return (T) this;
+		}
+		throw new SQLException("DataSource of type [" + getClass().getName() +
+				"] cannot be unwrapped as [" + iface.getName() + "]");
+	}
+
+	@Override
+	public boolean isWrapperFor(Class<?> iface) throws SQLException {
+		return iface.isInstance(this);
+	}
+
+
+	//---------------------------------------------------------------------
+	// Implementation of JDBC 4.1's getParentLogger method
+	//---------------------------------------------------------------------
+
+	@Override
+	public Logger getParentLogger() {
+		return null;
+	}
+
+}
diff --git a/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java b/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
new file mode 100644
index 00000000000..b2182d1194d
--- /dev/null
+++ b/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2002-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jdbc.datasource;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public abstract class AbstractDriverBasedDataSource extends AbstractDataSource {
+
+    private String url;
+
+	private String username;
+
+	private String password;
+
+	private String catalog;
+
+	private String schema;
+
+	private Properties connectionProperties;
+
+
+	/**
+	 * Set the JDBC URL to use for connecting through the Driver.
+	 * @see java.sql.Driver#connect(String, java.util.Properties)
+	 */
+	public void setUrl(String url) {
+		this.url = (url != null ? url.trim() : null);
+	}
+
+	/**
+	 * Return the JDBC URL to use for connecting through the Driver.
+	 */
+	public String getUrl() {
+		return this.url;
+	}
+
+	/**
+	 * Set the JDBC username to use for connecting through the Driver.
+	 * @see java.sql.Driver#connect(String, java.util.Properties)
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * Return the JDBC username to use for connecting through the Driver.
+	 */
+	public String getUsername() {
+		return this.username;
+	}
+
+	/**
+	 * Set the JDBC password to use for connecting through the Driver.
+	 * @see java.sql.Driver#connect(String, java.util.Properties)
+	 */
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	/**
+	 * Return the JDBC password to use for connecting through the Driver.
+	 */
+	public String getPassword() {
+		return this.password;
+	}
+
+	/**
+	 * Specify a database catalog to be applied to each Connection.
+	 * @since 4.3.2
+	 * @see Connection#setCatalog
+	 */
+	public void setCatalog(String catalog) {
+		this.catalog = catalog;
+	}
+
+	/**
+	 * Return the database catalog to be applied to each Connection, if any.
+	 * @since 4.3.2
+	 */
+	public String getCatalog() {
+		return this.catalog;
+	}
+
+	/**
+	 * Specify a database schema to be applied to each Connection.
+	 * @since 4.3.2
+	 * @see Connection#setSchema
+	 */
+	public void setSchema(String schema) {
+		this.schema = schema;
+	}
+
+	/**
+	 * Return the database schema to be applied to each Connection, if any.
+	 * @since 4.3.2
+	 */
+	public String getSchema() {
+		return this.schema;
+	}
+
+	/**
+	 * Specify arbitrary connection properties as key/value pairs,
+	 * to be passed to the Driver.
+	 * <p>Can also contain "user" and "password" properties. However,
+	 * any "username" and "password" bean properties specified on this
+	 * DataSource will override the corresponding connection properties.
+	 * @see java.sql.Driver#connect(String, java.util.Properties)
+	 */
+	public void setConnectionProperties(Properties connectionProperties) {
+		this.connectionProperties = connectionProperties;
+	}
+
+	/**
+	 * Return the connection properties to be passed to the Driver, if any.
+	 */
+	public Properties getConnectionProperties() {
+		return this.connectionProperties;
+	}
+
+
+	/**
+	 * This implementation delegates to {@code getConnectionFromDriver},
+	 * using the default username and password of this DataSource.
+	 * @see #getConnectionFromDriver(String, String)
+	 * @see #setUsername
+	 * @see #setPassword
+	 */
+	@Override
+	public Connection getConnection() throws SQLException {
+		return getConnectionFromDriver(getUsername(), getPassword());
+	}
+
+	/**
+	 * This implementation delegates to {@code getConnectionFromDriver},
+	 * using the given username and password.
+	 * @see #getConnectionFromDriver(String, String)
+	 */
+	@Override
+	public Connection getConnection(String username, String password) throws SQLException {
+		return getConnectionFromDriver(username, password);
+	}
+
+
+	/**
+	 * Build properties for the Driver, including the given username and password (if any),
+	 * and obtain a corresponding Connection.
+	 * @param username the name of the user
+	 * @param password the password to use
+	 * @return the obtained Connection
+	 * @throws SQLException in case of failure
+	 * @see java.sql.Driver#connect(String, java.util.Properties)
+	 */
+	protected Connection getConnectionFromDriver(String username, String password) throws SQLException {
+		Properties mergedProps = new Properties();
+		Properties connProps = getConnectionProperties();
+		if (connProps != null) {
+			mergedProps.putAll(connProps);
+		}
+		if (username != null) {
+			mergedProps.setProperty("user", username);
+		}
+		if (password != null) {
+			mergedProps.setProperty("password", password);
+		}
+
+		Connection con = getConnectionFromDriver(mergedProps);
+		if (this.catalog != null) {
+			con.setCatalog(this.catalog);
+		}
+		if (this.schema != null) {
+			con.setSchema(this.schema);
+		}
+		return con;
+	}
+
+	/**
+	 * Obtain a Connection using the given properties.
+	 * <p>Template method to be implemented by subclasses.
+	 * @param props the merged connection properties
+	 * @return the obtained Connection
+	 * @throws SQLException in case of failure
+	 */
+	protected abstract Connection getConnectionFromDriver(Properties props) throws SQLException;
+
+}
diff --git a/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/DriverManagerDataSource.java
new file mode 100644
index 00000000000..d4fb9545347
--- /dev/null
+++ b/java/ql/test/stubs/spring-jdbc-5.3.8/org/springframework/jdbc/datasource/DriverManagerDataSource.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2002-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jdbc.datasource;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public class DriverManagerDataSource extends AbstractDriverBasedDataSource {
+
+	/**
+	 * Constructor for bean-style configuration.
+	 */
+	public DriverManagerDataSource() {
+	}
+
+	/**
+	 * Create a new DriverManagerDataSource with the given JDBC URL,
+	 * not specifying a username or password for JDBC access.
+	 * @param url the JDBC URL to use for accessing the DriverManager
+	 * @see java.sql.DriverManager#getConnection(String)
+	 */
+	public DriverManagerDataSource(String url) {
+	}
+
+	/**
+	 * Create a new DriverManagerDataSource with the given standard
+	 * DriverManager parameters.
+	 * @param url the JDBC URL to use for accessing the DriverManager
+	 * @param username the JDBC username to use for accessing the DriverManager
+	 * @param password the JDBC password to use for accessing the DriverManager
+	 * @see java.sql.DriverManager#getConnection(String, String, String)
+	 */
+	public DriverManagerDataSource(String url, String username, String password) {
+	}
+
+	/**
+	 * Create a new DriverManagerDataSource with the given JDBC URL,
+	 * not specifying a username or password for JDBC access.
+	 * @param url the JDBC URL to use for accessing the DriverManager
+	 * @param conProps the JDBC connection properties
+	 * @see java.sql.DriverManager#getConnection(String)
+	 */
+	public DriverManagerDataSource(String url, Properties conProps) {
+	}
+
+
+	/**
+	 * Set the JDBC driver class name. This driver will get initialized
+	 * on startup, registering itself with the JDK's DriverManager.
+	 * <p><b>NOTE: DriverManagerDataSource is primarily intended for accessing
+	 * <i>pre-registered</i> JDBC drivers.</b> If you need to register a new driver,
+	 * consider using {@link SimpleDriverDataSource} instead. Alternatively, consider
+	 * initializing the JDBC driver yourself before instantiating this DataSource.
+	 * The "driverClassName" property is mainly preserved for backwards compatibility,
+	 * as well as for migrating between Commons DBCP and this DataSource.
+	 * @see java.sql.DriverManager#registerDriver(java.sql.Driver)
+	 * @see SimpleDriverDataSource
+	 */
+	public void setDriverClassName(String driverClassName) {
+	}
+
+
+	@Override
+	protected Connection getConnectionFromDriver(Properties props) throws SQLException {
+		String url = getUrl();
+		return getConnectionFromDriverManager(url, props);
+	}
+
+	/**
+	 * Getting a Connection using the nasty static from DriverManager is extracted
+	 * into a protected method to allow for easy unit testing.
+	 * @see java.sql.DriverManager#getConnection(String, java.util.Properties)
+	 */
+	protected Connection getConnectionFromDriverManager(String url, Properties props) throws SQLException {
+		return DriverManager.getConnection(url, props);
+	}
+
+}
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java b/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java
new file mode 100644
index 00000000000..d85bb46dfd7
--- /dev/null
+++ b/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.jdbc;
+
+import javax.sql.DataSource;
+
+public final class DataSourceBuilder<T extends DataSource> {
+
+    public DataSourceBuilder<T> url(String url) {
+		return this;
+	}
+
+}
\ No newline at end of file
diff --git a/javascript/ql/examples/snippets/jsxattribute.ql b/javascript/ql/examples/snippets/jsxattribute.ql
index ad7a6458667..b55abc09dd0 100644
--- a/javascript/ql/examples/snippets/jsxattribute.ql
+++ b/javascript/ql/examples/snippets/jsxattribute.ql
@@ -8,6 +8,6 @@
 
 import javascript
 
-from JSXAttribute a
+from JsxAttribute a
 where a.getName() = "dangerouslySetInnerHTML"
 select a
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll
index bec90be46cc..637255da80c 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll
@@ -4,7 +4,7 @@
  * Configures boosting for adaptive threat modeling (ATM).
  */
 
-private import javascript as raw
+private import javascript as JS
 import EndpointTypes
 
 /**
@@ -28,23 +28,23 @@ import EndpointTypes
  * `isAdditionalFlowStep` with a more generalised definition of additional edges. See
  * `NosqlInjectionATM.qll` for an example of doing this.
  */
-abstract class ATMConfig extends string {
+abstract class AtmConfig extends string {
   bindingset[this]
-  ATMConfig() { any() }
+  AtmConfig() { any() }
 
   /**
    * EXPERIMENTAL. This API may change in the future.
    *
    * Holds if `source` is a known source of flow.
    */
-  predicate isKnownSource(raw::DataFlow::Node source) { none() }
+  predicate isKnownSource(JS::DataFlow::Node source) { none() }
 
   /**
    * EXPERIMENTAL. This API may change in the future.
    *
    * Holds if `sink` is a known sink of flow.
    */
-  predicate isKnownSink(raw::DataFlow::Node sink) { none() }
+  predicate isKnownSink(JS::DataFlow::Node sink) { none() }
 
   /**
    * EXPERIMENTAL. This API may change in the future.
@@ -52,7 +52,7 @@ abstract class ATMConfig extends string {
    * Holds if the candidate source `candidateSource` predicted by the machine learning model should be
    * an effective source, i.e. one considered as a possible source of flow in the boosted query.
    */
-  predicate isEffectiveSource(raw::DataFlow::Node candidateSource) { none() }
+  predicate isEffectiveSource(JS::DataFlow::Node candidateSource) { none() }
 
   /**
    * EXPERIMENTAL. This API may change in the future.
@@ -60,29 +60,7 @@ abstract class ATMConfig extends string {
    * Holds if the candidate sink `candidateSink` predicted by the machine learning model should be
    * an effective sink, i.e. one considered as a possible sink of flow in the boosted query.
    */
-  predicate isEffectiveSink(raw::DataFlow::Node candidateSink) { none() }
-
-  /**
-   * EXPERIMENTAL. This API may change in the future.
-   *
-   * Holds if the candidate sink `candidateSink` predicted by the machine learning model should be
-   * an effective sink that overrides the score provided by the machine learning model with the
-   * score `score` for reason `why`. The effective sinks identified by this predicate MUST be a
-   * subset of those identified by the `isEffectiveSink` predicate.
-   *
-   * For example, in the ATM external API query, we use this method to ensure the ATM external API
-   * query produces the same results as the standard external API query, but assigns flows
-   * involving sinks that are filtered out by the endpoint filters a score of 0.
-   *
-   * This predicate can be phased out once we no longer need to rely on predicates like
-   * `paddedScore` in the ATM CodeQL libraries to add scores to alert messages in a way that works
-   * with lexical sort orders.
-   */
-  predicate isEffectiveSinkWithOverridingScore(
-    raw::DataFlow::Node candidateSink, float score, string why
-  ) {
-    none()
-  }
+  predicate isEffectiveSink(JS::DataFlow::Node candidateSink) { none() }
 
   /**
    * EXPERIMENTAL. This API may change in the future.
@@ -110,3 +88,6 @@ abstract class ATMConfig extends string {
    */
   float getScoreCutoff() { result = 0.0 }
 }
+
+/** DEPRECATED: Alias for AtmConfig */
+deprecated class ATMConfig = AtmConfig;
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/AdaptiveThreatModeling.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/AdaptiveThreatModeling.qll
index 678182f3987..002a5c8fe8e 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/AdaptiveThreatModeling.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/AdaptiveThreatModeling.qll
@@ -4,8 +4,7 @@
  * Provides information about the results of boosted queries for use in adaptive threat modeling (ATM).
  */
 
-private import javascript as raw
-private import raw::DataFlow as DataFlow
+private import javascript::DataFlow as DataFlow
 import ATMConfig
 private import BaseScoring
 private import EndpointScoring as EndpointScoring
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll
index 1af5966997a..a6787196bbb 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll
@@ -12,7 +12,7 @@ external predicate availableMlModels(
 );
 
 /** Get the ATM configuration. */
-ATMConfig getCfg() { any() }
+AtmConfig getCfg() { any() }
 
 /**
  * A string containing scoring information produced by a scoring model.
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll
index 4f0ad84b238..23ba238ff99 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll
@@ -61,7 +61,7 @@ predicate isArgumentToKnownLibrarySinkFunction(DataFlow::Node n) {
  * This corresponds to known sinks from security queries whose sources include remote flow and
  * DOM-based sources.
  */
-predicate isKnownExternalAPIQuerySink(DataFlow::Node n) {
+predicate isKnownExternalApiQuerySink(DataFlow::Node n) {
   n instanceof Xxe::Sink or
   n instanceof TaintedPath::Sink or
   n instanceof XpathInjection::Sink or
@@ -86,11 +86,14 @@ predicate isKnownExternalAPIQuerySink(DataFlow::Node n) {
   n instanceof HttpToFileAccess::Sink
 }
 
+/** DEPRECATED: Alias for isKnownExternalApiQuerySink */
+deprecated predicate isKnownExternalAPIQuerySink = isKnownExternalApiQuerySink/1;
+
 /**
  * Holds if the node `n` is a known sink in a modeled library.
  */
 predicate isKnownLibrarySink(DataFlow::Node n) {
-  isKnownExternalAPIQuerySink(n) or
+  isKnownExternalApiQuerySink(n) or
   n instanceof CleartextLogging::Sink or
   n instanceof StackTraceExposure::Sink or
   n instanceof ShellCommandInjectionFromEnvironment::Sink or
@@ -207,7 +210,7 @@ predicate isOtherModeledArgument(DataFlow::Node n, FilteringReason reason) {
       DatabaseAccess and
     reason instanceof DatabaseAccessReason
     or
-    call = DOM::domValueRef() and reason instanceof DOMReason
+    call = DOM::domValueRef() and reason instanceof DomReason
     or
     call.getCalleeName() = "next" and
     exists(DataFlow::FunctionNode f | call = f.getLastParameter().getACall()) and
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointScoring.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointScoring.qll
index 0ce13b3e180..a0d7fd528d3 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointScoring.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointScoring.qll
@@ -62,14 +62,11 @@ private float getScoreForSource(DataFlow::Node source) {
 private float getScoreForSink(DataFlow::Node sink) {
   if getCfg().isKnownSink(sink)
   then result = 1.0
-  else
-    if getCfg().isEffectiveSinkWithOverridingScore(sink, result, _)
-    then any()
-    else (
-      // This restriction on `sink` has no semantic effect but improves performance.
-      getCfg().isEffectiveSink(sink) and
-      ModelScoring::endpointScores(sink, getCfg().getASinkEndpointType().getEncoding(), result)
-    )
+  else (
+    // This restriction on `sink` has no semantic effect but improves performance.
+    getCfg().isEffectiveSink(sink) and
+    ModelScoring::endpointScores(sink, getCfg().getASinkEndpointType().getEncoding(), result)
+  )
 }
 
 class EndpointScoringResults extends ScoringResults {
@@ -109,10 +106,6 @@ class EndpointScoringResults extends ScoringResults {
     result = "known" and getCfg().isKnownSink(sink)
     or
     not getCfg().isKnownSink(sink) and
-    getCfg().isEffectiveSinkWithOverridingScore(sink, _, result)
-    or
-    not getCfg().isKnownSink(sink) and
-    not getCfg().isEffectiveSinkWithOverridingScore(sink, _, _) and
     result =
       "predicted (scores: " +
         concat(EndpointType type, float score |
@@ -127,29 +120,21 @@ class EndpointScoringResults extends ScoringResults {
   override predicate shouldResultBeIncluded(DataFlow::Node source, DataFlow::Node sink) {
     if getCfg().isKnownSink(sink)
     then any()
-    else
-      if getCfg().isEffectiveSinkWithOverridingScore(sink, _, _)
-      then
-        exists(float score |
-          getCfg().isEffectiveSinkWithOverridingScore(sink, score, _) and
-          score >= getCfg().getScoreCutoff()
-        )
-      else (
-        // This restriction on `sink` has no semantic effect but improves performance.
-        getCfg().isEffectiveSink(sink) and
-        exists(float sinkScore |
-          ModelScoring::endpointScores(sink, getCfg().getASinkEndpointType().getEncoding(),
-            sinkScore) and
-          // Include the endpoint if (a) the query endpoint type scores higher than all other
-          // endpoint types, or (b) the query endpoint type scores at least
-          // 0.5 - (getCfg().getScoreCutoff() / 2).
-          sinkScore >=
-            [
-              max(float s | ModelScoring::endpointScores(sink, _, s)),
-              0.5 - getCfg().getScoreCutoff() / 2
-            ]
-        )
+    else (
+      // This restriction on `sink` has no semantic effect but improves performance.
+      getCfg().isEffectiveSink(sink) and
+      exists(float sinkScore |
+        ModelScoring::endpointScores(sink, getCfg().getASinkEndpointType().getEncoding(), sinkScore) and
+        // Include the endpoint if (a) the query endpoint type scores higher than all other
+        // endpoint types, or (b) the query endpoint type scores at least
+        // 0.5 - (getCfg().getScoreCutoff() / 2).
+        sinkScore >=
+          [
+            max(float s | ModelScoring::endpointScores(sink, _, s)),
+            0.5 - getCfg().getScoreCutoff() / 2
+          ]
       )
+    )
   }
 }
 
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll
index 063cf567fc9..4b0cdb986e8 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll
@@ -24,7 +24,7 @@ newtype TFilteringReason =
   TMembershipCandidateTestReason() or
   TFileSystemAccessReason() or
   TDatabaseAccessReason() or
-  TDOMReason() or
+  TDomReason() or
   TNextFunctionCallReason() or
   TArgumentToArrayReason() or
   TArgumentToBuiltinGlobalVarRefReason() or
@@ -161,12 +161,15 @@ class DatabaseAccessReason extends NotASinkReason, TDatabaseAccessReason {
   override int getEncoding() { result = 21 }
 }
 
-class DOMReason extends NotASinkReason, TDOMReason {
+class DomReason extends NotASinkReason, TDomReason {
   override string getDescription() { result = "DOM" }
 
   override int getEncoding() { result = 22 }
 }
 
+/** DEPRECATED: Alias for DomReason */
+deprecated class DOMReason = DomReason;
+
 class NextFunctionCallReason extends NotASinkReason, TNextFunctionCallReason {
   override string getDescription() { result = "NextFunctionCall" }
 
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll
index 6459a30250f..4b1a5778cc0 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll
@@ -10,7 +10,7 @@ private import FeaturizationConfig
 /**
  * Gets a tokenized representation of the AST node for use in the `enclosingFunctionBody` feature.
  */
-string getTokenizedAstNode(ASTNode node) {
+string getTokenizedAstNode(AstNode node) {
   // e.g. `x` -> "x"
   result = node.(Identifier).getName()
   or
@@ -35,12 +35,15 @@ string getTokenizedAstNode(ASTNode node) {
 
 /** Gets an AST node within the function `f` that we should featurize. */
 pragma[inline]
-ASTNode getAnASTNodeToFeaturize(Function f) {
+AstNode getAnAstNodeToFeaturize(Function f) {
   result.getParent*() = f and
   // Don't featurize the function name as part of the function body tokens
   not result = f.getIdentifier()
 }
 
+/** DEPRECATED: Alias for getAnAstNodeToFeaturize */
+deprecated ASTNode getAnASTNodeToFeaturize(Function f) { result = getAnAstNodeToFeaturize(f) }
+
 /**
  * Gets a function that contains the endpoint.
  *
@@ -72,7 +75,7 @@ private int getMaxNumAstNodes() { result = 1024 }
 private int getNumAstNodesInFunction(Function function) {
   // Restrict the values `function` can take on
   function = getAFunctionForEndpoint(_) and
-  result = count(getAnASTNodeToFeaturize(function))
+  result = count(getAnAstNodeToFeaturize(function))
 }
 
 /**
@@ -121,16 +124,19 @@ Function getRepresentativeFunctionForEndpoint(DataFlow::Node endpoint) {
 }
 
 /** Returns an AST node within the function `f` that an associated token feature. */
-ASTNode getAnASTNodeWithAFeature(Function f) {
+AstNode getAnAstNodeWithAFeature(Function f) {
   // Performance optimization: Restrict the set of functions to those containing an endpoint to featurize.
   f = getRepresentativeFunctionForEndpoint(any(FeaturizationConfig cfg).getAnEndpointToFeaturize()) and
-  result = getAnASTNodeToFeaturize(f)
+  result = getAnAstNodeToFeaturize(f)
 }
 
+/** DEPRECATED: Alias for getAnAstNodeWithAFeature */
+deprecated ASTNode getAnASTNodeWithAFeature(Function f) { result = getAnAstNodeWithAFeature(f) }
+
 /** Returns the number of source-code characters in a function. */
 int getNumCharsInFunction(Function f) {
   result =
-    strictsum(ASTNode node | node = getAnASTNodeWithAFeature(f) | getTokenizedAstNode(node).length())
+    strictsum(AstNode node | node = getAnAstNodeWithAFeature(f) | getTokenizedAstNode(node).length())
 }
 
 /**
@@ -149,8 +155,8 @@ string getBodyTokensFeature(Function function) {
   // large body features are replaced by the absent token.
   //
   // We count nodes instead of tokens because tokens are often not unique.
-  strictcount(ASTNode node |
-    node = getAnASTNodeToFeaturize(function) and
+  strictcount(AstNode node |
+    node = getAnAstNodeToFeaturize(function) and
     exists(getTokenizedAstNode(node))
   ) <= 256 and
   // Performance optimization: If a function has more than getMaxChars() characters in its body subtokens,
@@ -161,8 +167,8 @@ string getBodyTokensFeature(Function function) {
       // The use of a nested exists here allows us to avoid duplicates due to two AST nodes in the
       // same location featurizing to the same token. By using a nested exists, we take only unique
       // (location, token) pairs.
-      exists(ASTNode node |
-        node = getAnASTNodeToFeaturize(function) and
+      exists(AstNode node |
+        node = getAnAstNodeToFeaturize(function) and
         token = getTokenizedAstNode(node) and
         l = node.getLocation()
       )
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
index ed5ac92ba58..2d5b2a58510 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
@@ -87,8 +87,8 @@ module SinkEndpointFilter {
   }
 }
 
-class NosqlInjectionATMConfig extends ATMConfig {
-  NosqlInjectionATMConfig() { this = "NosqlInjectionATMConfig" }
+class NosqlInjectionAtmConfig extends AtmConfig {
+  NosqlInjectionAtmConfig() { this = "NosqlInjectionATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) {
     source instanceof NosqlInjection::Source or TaintedObject::isSource(source, _)
@@ -103,7 +103,10 @@ class NosqlInjectionATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof NosqlInjectionSinkType }
 }
 
-/** Holds if src -> trg is an additional flow step in the non-boosted NoSQL injection security query. */
+/** DEPRECATED: Alias for NosqlInjectionAtmConfig */
+deprecated class NosqlInjectionATMConfig = NosqlInjectionAtmConfig;
+
+/** Holds if src -> trg is an additional flow step in the non-boosted NoSql injection security query. */
 predicate isBaseAdditionalFlowStep(
   DataFlow::Node src, DataFlow::Node trg, DataFlow::FlowLabel inlbl, DataFlow::FlowLabel outlbl
 ) {
@@ -112,7 +115,7 @@ predicate isBaseAdditionalFlowStep(
   // additional flow step to track taint through NoSQL query objects
   inlbl = TaintedObject::label() and
   outlbl = TaintedObject::label() and
-  exists(NoSQL::Query query, DataFlow::SourceNode queryObj |
+  exists(NoSql::Query query, DataFlow::SourceNode queryObj |
     queryObj.flowsToExpr(query) and
     queryObj.flowsTo(trg) and
     src = queryObj.getAPropertyWrite().getRhs()
@@ -120,13 +123,17 @@ predicate isBaseAdditionalFlowStep(
 }
 
 /**
+ * Gets a value that is (transitively) written to `query`, where `query` is a NoSQL sink.
+ *
  * This predicate allows us to propagate data flow through property writes and array constructors
  * within a query object, enabling the security query to pick up NoSQL injection vulnerabilities
  * involving more complex queries.
  */
 DataFlow::Node getASubexpressionWithinQuery(DataFlow::Node query) {
+  any(NosqlInjectionAtmConfig cfg).isEffectiveSink(query) and
   exists(DataFlow::SourceNode receiver |
-    receiver.flowsTo(getASubexpressionWithinQuery*(query.getALocalSource())) and
+    receiver = [getASubexpressionWithinQuery(query), query].getALocalSource()
+  |
     result =
       [receiver.getAPropertyWrite().getRhs(), receiver.(DataFlow::ArrayCreationNode).getAnElement()]
   )
@@ -152,7 +159,7 @@ class Configuration extends TaintTracking::Configuration {
     sink.(NosqlInjection::Sink).getAFlowLabel() = label
     or
     // Allow effective sinks to have any taint label
-    any(NosqlInjectionATMConfig cfg).isEffectiveSink(sink)
+    any(NosqlInjectionAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) {
@@ -171,7 +178,7 @@ class Configuration extends TaintTracking::Configuration {
     isBaseAdditionalFlowStep(src, trg, inlbl, outlbl)
     or
     // relaxed version of previous step to track taint through unmodeled NoSQL query objects
-    any(NosqlInjectionATMConfig cfg).isEffectiveSink(trg) and
+    any(NosqlInjectionAtmConfig cfg).isEffectiveSink(trg) and
     src = getASubexpressionWithinQuery(trg)
   }
 }
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll
index 86ceadf4f84..b3b722fb0fc 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll
@@ -60,8 +60,8 @@ module SinkEndpointFilter {
   }
 }
 
-class SqlInjectionATMConfig extends ATMConfig {
-  SqlInjectionATMConfig() { this = "SqlInjectionATMConfig" }
+class SqlInjectionAtmConfig extends AtmConfig {
+  SqlInjectionAtmConfig() { this = "SqlInjectionATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) { source instanceof SqlInjection::Source }
 
@@ -74,6 +74,9 @@ class SqlInjectionATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof SqlInjectionSinkType }
 }
 
+/** DEPRECATED: Alias for SqlInjectionAtmConfig */
+deprecated class SqlInjectionATMConfig = SqlInjectionAtmConfig;
+
 /**
  * A taint-tracking configuration for reasoning about SQL injection vulnerabilities.
  *
@@ -86,7 +89,7 @@ class Configuration extends TaintTracking::Configuration {
   override predicate isSource(DataFlow::Node source) { source instanceof SqlInjection::Source }
 
   override predicate isSink(DataFlow::Node sink) {
-    sink instanceof SqlInjection::Sink or any(SqlInjectionATMConfig cfg).isEffectiveSink(sink)
+    sink instanceof SqlInjection::Sink or any(SqlInjectionAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) {
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
index 908bab9fd51..109fd357007 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
@@ -59,8 +59,8 @@ module SinkEndpointFilter {
   }
 }
 
-class TaintedPathATMConfig extends ATMConfig {
-  TaintedPathATMConfig() { this = "TaintedPathATMConfig" }
+class TaintedPathAtmConfig extends AtmConfig {
+  TaintedPathAtmConfig() { this = "TaintedPathATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) { source instanceof TaintedPath::Source }
 
@@ -73,6 +73,9 @@ class TaintedPathATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof TaintedPathSinkType }
 }
 
+/** DEPRECATED: Alias for TaintedPathAtmConfig */
+deprecated class TaintedPathATMConfig = TaintedPathAtmConfig;
+
 /**
  * A taint-tracking configuration for reasoning about path injection vulnerabilities.
  *
@@ -88,7 +91,7 @@ class Configuration extends TaintTracking::Configuration {
     label = sink.(TaintedPath::Sink).getAFlowLabel()
     or
     // Allow effective sinks to have any taint label
-    any(TaintedPathATMConfig cfg).isEffectiveSink(sink)
+    any(TaintedPathAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof TaintedPath::Sanitizer }
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll
index 009db55b86a..796fc94c64e 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll
@@ -60,8 +60,8 @@ module SinkEndpointFilter {
   }
 }
 
-class DomBasedXssATMConfig extends ATMConfig {
-  DomBasedXssATMConfig() { this = "DomBasedXssATMConfig" }
+class DomBasedXssAtmConfig extends AtmConfig {
+  DomBasedXssAtmConfig() { this = "DomBasedXssATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) { source instanceof DomBasedXss::Source }
 
@@ -74,6 +74,9 @@ class DomBasedXssATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof XssSinkType }
 }
 
+/** DEPRECATED: Alias for DomBasedXssAtmConfig */
+deprecated class DomBasedXssATMConfig = DomBasedXssAtmConfig;
+
 /**
  * A taint-tracking configuration for reasoning about XSS vulnerabilities.
  *
@@ -87,7 +90,7 @@ class Configuration extends TaintTracking::Configuration {
 
   override predicate isSink(DataFlow::Node sink) {
     sink instanceof DomBasedXss::Sink or
-    any(DomBasedXssATMConfig cfg).isEffectiveSink(sink)
+    any(DomBasedXssAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) {
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml b/javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml
index 9389534628f..ba0709c7553 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-experimental-atm-lib
-version: 0.0.6
+version: 0.1.1
 extractor: javascript
 library: true
 groups:
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
index 9be2929fd41..215103358ea 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
@@ -33,7 +33,7 @@ string getDescriptionForAlertCandidate(
 ) {
   result = "excluded[reason=" + getAReasonSinkExcluded(sinkCandidate, query) + "]"
   or
-  getATMCfg(query).isKnownSink(sinkCandidate) and
+  getAtmCfg(query).isKnownSink(sinkCandidate) and
   result = "excluded[reason=known-sink]"
   or
   not exists(getAReasonSinkExcluded(sinkCandidate, query)) and
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql
index 997c61bc096..dca511762b0 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql
@@ -20,7 +20,7 @@ import semmle.javascript.security.dataflow.DeepObjectResourceExhaustionQuery as
 import semmle.javascript.security.dataflow.DifferentKindsComparisonBypassQuery as DifferentKindsComparisonBypass
 import semmle.javascript.security.dataflow.DomBasedXssQuery as DomBasedXss
 import semmle.javascript.security.dataflow.ExceptionXssQuery as ExceptionXss
-import semmle.javascript.security.dataflow.ExternalAPIUsedWithUntrustedDataQuery as ExternalAPIUsedWithUntrustedData
+import semmle.javascript.security.dataflow.ExternalAPIUsedWithUntrustedDataQuery as ExternalApiUsedWithUntrustedData
 import semmle.javascript.security.dataflow.FileAccessToHttpQuery as FileAccessToHttp
 import semmle.javascript.security.dataflow.HardcodedCredentialsQuery as HardcodedCredentials
 import semmle.javascript.security.dataflow.HardcodedDataInterpretedAsCodeQuery as HardcodedDataInterpretedAsCode
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
index bea47423797..695945fb28f 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
@@ -23,17 +23,20 @@ import NoFeaturizationRestrictionsConfig
 import Queries
 
 /** Gets the ATM configuration object for the specified query. */
-ATMConfig getATMCfg(Query query) {
+AtmConfig getAtmCfg(Query query) {
   query instanceof NosqlInjectionQuery and
-  result instanceof NosqlInjectionATM::NosqlInjectionATMConfig
+  result instanceof NosqlInjectionATM::NosqlInjectionAtmConfig
   or
-  query instanceof SqlInjectionQuery and result instanceof SqlInjectionATM::SqlInjectionATMConfig
+  query instanceof SqlInjectionQuery and result instanceof SqlInjectionATM::SqlInjectionAtmConfig
   or
-  query instanceof TaintedPathQuery and result instanceof TaintedPathATM::TaintedPathATMConfig
+  query instanceof TaintedPathQuery and result instanceof TaintedPathATM::TaintedPathAtmConfig
   or
-  query instanceof XssQuery and result instanceof XssATM::DomBasedXssATMConfig
+  query instanceof XssQuery and result instanceof XssATM::DomBasedXssAtmConfig
 }
 
+/** DEPRECATED: Alias for getAtmCfg */
+deprecated ATMConfig getATMCfg(Query query) { result = getAtmCfg(query) }
+
 /** Gets the ATM data flow configuration for the specified query. */
 DataFlow::Configuration getDataFlowCfg(Query query) {
   query instanceof NosqlInjectionQuery and result instanceof NosqlInjectionATM::Configuration
@@ -47,7 +50,7 @@ DataFlow::Configuration getDataFlowCfg(Query query) {
 
 /** Gets a known sink for the specified query. */
 private DataFlow::Node getASink(Query query) {
-  getATMCfg(query).isKnownSink(result) and
+  getAtmCfg(query).isKnownSink(result) and
   // Only consider the source code for the project being analyzed.
   exists(result.getFile().getRelativePath())
 }
@@ -71,10 +74,7 @@ private DataFlow::Node getANotASink(NotASinkReason reason) {
  * specified query.
  */
 private DataFlow::Node getAnUnknown(Query query) {
-  (
-    getATMCfg(query).isEffectiveSink(result) or
-    getATMCfg(query).isEffectiveSinkWithOverridingScore(result, _, _)
-  ) and
+  getAtmCfg(query).isEffectiveSink(result) and
   not result = getASink(query) and
   // Only consider the source code for the project being analyzed.
   exists(result.getFile().getRelativePath())
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
new file mode 100644
index 00000000000..bc625ded300
--- /dev/null
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
@@ -0,0 +1,28 @@
+/*
+ * For internal use only.
+ *
+ * Maps ML-powered queries to their `EndpointType` for clearer labelling while evaluating ML model during training.
+ */
+
+import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionATM
+import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionATM
+import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathATM
+import experimental.adaptivethreatmodeling.XssATM as XssATM
+import experimental.adaptivethreatmodeling.AdaptiveThreatModeling
+
+from string queryName, AtmConfig c, EndpointType e
+where
+  (
+    queryName = "SqlInjectionATM.ql" and
+    c instanceof SqlInjectionATM::SqlInjectionAtmConfig
+    or
+    queryName = "NosqlInjectionATM.ql" and
+    c instanceof NosqlInjectionATM::NosqlInjectionAtmConfig
+    or
+    queryName = "TaintedPathInjectionATM.ql" and
+    c instanceof TaintedPathATM::TaintedPathAtmConfig
+    or
+    queryName = "XssATM.ql" and c instanceof XssATM::DomBasedXssAtmConfig
+  ) and
+  e = c.getASinkEndpointType()
+select queryName, e.getEncoding() as endpointTypeEncoded
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql
index f05048f8cdc..b09eed5964d 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql
@@ -19,8 +19,8 @@ EndpointType getEndpointType() { result instanceof NosqlInjectionSinkType }
 DataFlow::Node getAPositiveEndpoint() { result instanceof NosqlInjection::Sink }
 
 /** An ATM configuration to find misclassified endpoints of type `getEndpointType()`. */
-class ExtractMisclassifiedEndpointsATMConfig extends ATMConfig {
-  ExtractMisclassifiedEndpointsATMConfig() { this = "ExtractMisclassifiedEndpointsATMConfig" }
+class ExtractMisclassifiedEndpointsAtmConfig extends AtmConfig {
+  ExtractMisclassifiedEndpointsAtmConfig() { this = "ExtractMisclassifiedEndpointsATMConfig" }
 
   override predicate isEffectiveSink(DataFlow::Node sinkCandidate) {
     sinkCandidate = getAPositiveEndpoint()
@@ -31,7 +31,7 @@ class ExtractMisclassifiedEndpointsATMConfig extends ATMConfig {
 
 /** Get an endpoint from `getAPositiveEndpoint()` that is incorrectly excluded from the results. */
 DataFlow::Node getAMisclassifedEndpoint() {
-  any(ExtractMisclassifiedEndpointsATMConfig config).isEffectiveSink(result) and
+  any(ExtractMisclassifiedEndpointsAtmConfig config).isEffectiveSink(result) and
   not any(ScoringResults results).shouldResultBeIncluded(_, result)
 }
 
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml b/javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml
index 8520659433d..10959ad8fdf 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml
+++ b/javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/javascript-experimental-atm-queries
 language: javascript
-version: 0.0.6
+version: 0.1.1
 suites: codeql-suites
 defaultSuiteFile: codeql-suites/javascript-atm-code-scanning.qls
 groups:
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index b7b52ff7c15..d916a226c7f 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.0.12
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 4.6.
+
+### Minor Analysis Improvements
+
+* Added sources from the [`jszip`](https://www.npmjs.com/package/jszip) library to the `js/zipslip` query.
+
 ## 0.0.11
 
 ## 0.0.10
diff --git a/javascript/ql/lib/Expressions/DOMProperties.qll b/javascript/ql/lib/Expressions/DOMProperties.qll
index 7ff1884fb1b..17f53f8a366 100644
--- a/javascript/ql/lib/Expressions/DOMProperties.qll
+++ b/javascript/ql/lib/Expressions/DOMProperties.qll
@@ -4,15 +4,16 @@
 
 import semmle.javascript.Externs
 
-/** Holds if `et` is a root interface of the DOM type hierarchy. */
-predicate isDOMRootType(ExternalType et) {
-  exists(string n | n = et.getName() | n = "EventTarget" or n = "StyleSheet")
-}
+/** DEPRECATED: Alias for isDomRootType */
+deprecated predicate isDOMRootType = isDomRootType/1;
 
 /** Holds if `p` is declared as a property of a DOM class or interface. */
 pragma[nomagic]
-predicate isDOMProperty(string p) {
+predicate isDomProperty(string p) {
   exists(ExternalMemberDecl emd | emd.getName() = p |
-    isDOMRootType(emd.getDeclaringType().getASupertype*())
+    isDomRootType(emd.getDeclaringType().getASupertype*())
   )
 }
+
+/** DEPRECATED: Alias for isDomProperty */
+deprecated predicate isDOMProperty = isDomProperty/1;
diff --git a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
index 220eef15a4a..691424f3b71 100644
--- a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
+++ b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
@@ -143,7 +143,7 @@ predicate hasNoEffect(Expr e) {
   // don't complain about declarations
   not isDeclaration(e) and
   // exclude DOM properties, which sometimes have magical auto-update properties
-  not isDOMProperty(e.(PropAccess).getPropertyName()) and
+  not isDomProperty(e.(PropAccess).getPropertyName()) and
   // exclude xUnit.js annotations
   not e instanceof XUnitAnnotation and
   // exclude common patterns that are most likely intentional
diff --git a/javascript/ql/lib/change-notes/2022-02-04-jszip.md b/javascript/ql/lib/change-notes/2022-02-04-jszip.md
deleted file mode 100644
index cc00e02efb5..00000000000
--- a/javascript/ql/lib/change-notes/2022-02-04-jszip.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added sources from the [`jszip`](https://www.npmjs.com/package/jszip) library to the `js/zipslip` query.
\ No newline at end of file
diff --git a/javascript/ql/lib/change-notes/2022-02-07-deleted-deprecations.md b/javascript/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
new file mode 100644
index 00000000000..e8da1e8e158
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* All deprecated predicates/classes/modules that have been deprecated for over a year have been deleted.
\ No newline at end of file
diff --git a/javascript/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md b/javascript/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
new file mode 100644
index 00000000000..a79f286aacd
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/javascript/ql/lib/change-notes/2022-02-07-deprecated-modules.md b/javascript/ql/lib/change-notes/2022-02-07-deprecated-modules.md
new file mode 100644
index 00000000000..561f68a150c
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2022-02-07-deprecated-modules.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Some modules that started with a lowercase letter have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/javascript/ql/lib/change-notes/2022-02-14-deprecated-predicates.md b/javascript/ql/lib/change-notes/2022-02-14-deprecated-predicates.md
new file mode 100644
index 00000000000..1b8bc1d53e8
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2022-02-14-deprecated-predicates.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Some predicates from `DefUse.qll`, `DataFlow.qll`, `TaintTracking.qll`, `DOM.qll`, `Definitions.qll` that weren't used by any query have been deprecated. 
+  The documentation for each predicate points to an alternative.
diff --git a/javascript/ql/lib/change-notes/2022-02-22-typescript-4-6.md b/javascript/ql/lib/change-notes/2022-02-22-typescript-4-6.md
deleted file mode 100644
index 8413cd02601..00000000000
--- a/javascript/ql/lib/change-notes/2022-02-22-typescript-4-6.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: majorAnalysis
----
-* Added support for TypeScript 4.6.
\ No newline at end of file
diff --git a/javascript/ql/lib/change-notes/released/0.0.12.md b/javascript/ql/lib/change-notes/released/0.0.12.md
new file mode 100644
index 00000000000..90747f5b02f
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/0.0.12.md
@@ -0,0 +1,9 @@
+## 0.0.12
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 4.6.
+
+### Minor Analysis Improvements
+
+* Added sources from the [`jszip`](https://www.npmjs.com/package/jszip) library to the `js/zipslip` query.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index e679dc42092..997fb8da83c 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.11
+lastReleaseVersion: 0.0.12
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 70fbb4bac8f..306591ab074 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 0.0.12-dev
+version: 0.0.13-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/lib/semmle/javascript/AMD.qll b/javascript/ql/lib/semmle/javascript/AMD.qll
index 4efa29f4873..0bab2511552 100644
--- a/javascript/ql/lib/semmle/javascript/AMD.qll
+++ b/javascript/ql/lib/semmle/javascript/AMD.qll
@@ -185,11 +185,6 @@ class AmdModuleDefinition extends CallExpr {
   }
 }
 
-/**
- * DEPRECATED: Use `AmdModuleDefinition` instead.
- */
-deprecated class AMDModuleDefinition = AmdModuleDefinition;
-
 /** An AMD dependency, considered as a path expression. */
 private class AmdDependencyPath extends PathExprCandidate {
   AmdDependencyPath() {
@@ -327,8 +322,3 @@ class AmdModule extends Module {
     result = getDefine().getModuleExpr().flow()
   }
 }
-
-/**
- * DEPRECATED: Use `AmdModule` instead.
- */
-deprecated class AMDModule = AmdModule;
diff --git a/javascript/ql/lib/semmle/javascript/AST.qll b/javascript/ql/lib/semmle/javascript/AST.qll
index d4f2de4b170..895922f952f 100644
--- a/javascript/ql/lib/semmle/javascript/AST.qll
+++ b/javascript/ql/lib/semmle/javascript/AST.qll
@@ -22,7 +22,7 @@ private import semmle.javascript.internal.CachedStages
  * abs(-42);
  * ```
  */
-class ASTNode extends @ast_node, NodeInStmtContainer {
+class AstNode extends @ast_node, NodeInStmtContainer {
   override Location getLocation() { hasLocation(this, result) }
 
   override File getFile() {
@@ -84,7 +84,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
    * _Note_: The indices of child nodes are considered an implementation detail and may
    * change between versions of the extractor.
    */
-  ASTNode getChild(int i) {
+  AstNode getChild(int i) {
     result = this.getChildExpr(i) or
     result = this.getChildStmt(i) or
     properties(result, this, i, _, _) or
@@ -101,7 +101,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
   TypeExpr getChildTypeExpr(int i) { typeexprs(result, _, this, i, _) }
 
   /** Gets a child node of this node. */
-  ASTNode getAChild() { result = this.getChild(_) }
+  AstNode getAChild() { result = this.getChild(_) }
 
   /** Gets a child expression of this node. */
   Expr getAChildExpr() { result = this.getChildExpr(_) }
@@ -120,7 +120,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the parent node of this node, if any. */
   cached
-  ASTNode getParent() { Stages::Ast::ref() and this = result.getAChild() }
+  AstNode getParent() { Stages::Ast::ref() and this = result.getAChild() }
 
   /** Gets the first control flow node belonging to this syntactic entity. */
   ControlFlowNode getFirstControlFlowNode() { result = this }
@@ -184,6 +184,9 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
   }
 }
 
+/** DEPRECATED: Alias for AstNode */
+deprecated class ASTNode = AstNode;
+
 /**
  * Holds if the given file is a `.d.ts` file.
  */
@@ -334,7 +337,10 @@ class EventHandlerCode extends @event_handler, CodeInAttribute { }
  * <a href="javascript:alert('hi')">Click me</a>
  * ```
  */
-class JavaScriptURL extends @javascript_url, CodeInAttribute { }
+class JavaScriptUrl extends @javascript_url, CodeInAttribute { }
+
+/** DEPRECATED: Alias for JavaScriptUrl */
+deprecated class JavaScriptURL = JavaScriptUrl;
 
 /**
  * A toplevel syntactic entity containing Closure-style externs definitions.
@@ -361,7 +367,7 @@ class Externs extends TopLevel {
  * i = 9
  * ```
  */
-class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, ASTNode { }
+class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, AstNode { }
 
 /**
  * A program element that contains statements, but isn't itself
@@ -375,7 +381,7 @@ class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, ASTNode { }
  * }
  * ```
  */
-class StmtContainer extends @stmt_container, ASTNode {
+class StmtContainer extends @stmt_container, AstNode {
   /** Gets the innermost enclosing container in which this container is nested. */
   cached
   StmtContainer getEnclosingContainer() { none() }
@@ -405,7 +411,7 @@ class StmtContainer extends @stmt_container, ASTNode {
    * For scripts or modules, this is the container itself; for functions,
    * it is the function body.
    */
-  ASTNode getBody() { result = this }
+  AstNode getBody() { result = this }
 
   /**
    * Gets the (unique) entry node of the control flow graph for this toplevel or function.
@@ -470,7 +476,7 @@ module AST {
    * function id(x) { return x; }    // function declaration
    * ```
    */
-  class ValueNode extends ASTNode, @dataflownode {
+  class ValueNode extends AstNode, @dataflownode {
     /** Gets type inference results for this element. */
     DataFlow::AnalyzedNode analyze() { result = DataFlow::valueNode(this).analyze() }
 
diff --git a/javascript/ql/lib/semmle/javascript/Aliases.qll b/javascript/ql/lib/semmle/javascript/Aliases.qll
index 3211145517a..021cca85120 100644
--- a/javascript/ql/lib/semmle/javascript/Aliases.qll
+++ b/javascript/ql/lib/semmle/javascript/Aliases.qll
@@ -13,11 +13,6 @@ class ArrayAccess = IndexExpr;
 
 class AssignOp = CompoundAssignExpr;
 
-/**
- * DEPRECATED: The name `BlockStmt` is now preferred in all languages.
- */
-deprecated class Block = BlockStmt;
-
 class BoolLiteral = BooleanLiteral;
 
 class CaseStmt = Case;
@@ -67,302 +62,3 @@ class ThisAccess = ThisExpr;
 class VariableAccess = VarAccess;
 
 class XorBitwiseExpr = XOrExpr;
-
-// Aliases for deprecated predicates from the dbscheme
-/**
- * Alias for the predicate `is_externs` defined in the .dbscheme.
- * Use `TopLevel#isExterns()` instead.
- */
-deprecated predicate isExterns(TopLevel toplevel) { is_externs(toplevel) }
-
-/**
- * Alias for the predicate `is_module` defined in the .dbscheme.
- * Use the `Module` class in `Module.qll` instead.
- */
-deprecated predicate isModule(TopLevel toplevel) { is_module(toplevel) }
-
-/**
- * Alias for the predicate `is_nodejs` defined in the .dbscheme.
- * Use `NodeModule` from `NodeJS.qll` instead.
- */
-deprecated predicate isNodejs(TopLevel toplevel) { is_nodejs(toplevel) }
-
-/**
- * Alias for the predicate `is_es2015_module` defined in the .dbscheme.
- * Use `ES2015Module` from `ES2015Modules.qll` instead.
- */
-deprecated predicate isES2015Module(TopLevel toplevel) { is_es2015_module(toplevel) }
-
-/**
- * Alias for the predicate `is_closure_module` defined in the .dbscheme.
- */
-deprecated predicate isClosureModule(TopLevel toplevel) { is_closure_module(toplevel) }
-
-/**
- * Alias for the predicate `stmt_containers` defined in the .dbscheme.
- * Use `ASTNode#getContainer()` instead.
- */
-deprecated predicate stmtContainers(Stmt stmt, StmtContainer container) {
-  stmt_containers(stmt, container)
-}
-
-/**
- * Alias for the predicate `jump_targets` defined in the .dbscheme.
- * Use `JumpStmt#getTarget()` instead.
- */
-deprecated predicate jumpTargets(Stmt jump, Stmt target) { jump_targets(jump, target) }
-
-/**
- * Alias for the predicate `is_instantiated` defined in the .dbscheme.
- * Use `NamespaceDeclaration#isInstantiated() instead.`
- */
-deprecated predicate isInstantiated(NamespaceDeclaration decl) { is_instantiated(decl) }
-
-/**
- * Alias for the predicate `has_declare_keyword` defined in the .dbscheme.
- */
-deprecated predicate hasDeclareKeyword(ASTNode stmt) { has_declare_keyword(stmt) }
-
-/**
- * Alias for the predicate `is_for_await_of` defined in the .dbscheme.
- * Use `ForOfStmt#isAwait()` instead.
- */
-deprecated predicate isForAwaitOf(ForOfStmt forof) { is_for_await_of(forof) }
-
-/**
- * Alias for the predicate `enclosing_stmt` defined in the .dbscheme.
- * Use `ExprOrType#getEnclosingStmt` instead.
- */
-deprecated predicate enclosingStmt(ExprOrType expr, Stmt stmt) { enclosing_stmt(expr, stmt) }
-
-/**
- * Alias for the predicate `expr_containers` defined in the .dbscheme.
- * Use `ASTNode#getContainer()` instead.
- */
-deprecated predicate exprContainers(ExprOrType expr, StmtContainer container) {
-  expr_containers(expr, container)
-}
-
-/**
- * Alias for the predicate `array_size` defined in the .dbscheme.
- * Use `ArrayExpr#getSize()` instead.
- */
-deprecated predicate arraySize(Expr ae, int sz) { array_size(ae, sz) }
-
-/**
- * Alias for the predicate `is_delegating` defined in the .dbscheme.
- * Use `YieldExpr#isDelegating()` instead.
- */
-deprecated predicate isDelegating(YieldExpr yield) { is_delegating(yield) }
-
-/**
- * Alias for the predicate `is_arguments_object` defined in the .dbscheme.
- * Use the `ArgumentsVariable` class instead.
- */
-deprecated predicate isArgumentsObject(Variable id) { is_arguments_object(id) }
-
-/**
- * Alias for the predicate `is_computed` defined in the .dbscheme.
- * Use the `isComputed()` method on the `MemberDeclaration`/`Property`/`PropertyPattern` class instead.
- */
-deprecated predicate isComputed(Property prop) { is_computed(prop) }
-
-/**
- * Alias for the predicate `is_method` defined in the .dbscheme.
- * Use the `isMethod()` method on the `MemberDeclaration`/`Property` class instead.
- */
-deprecated predicate isMethod(Property prop) { is_method(prop) }
-
-/**
- * Alias for the predicate `is_static` defined in the .dbscheme.
- * Use `MemberDeclaration#isStatic()` instead.
- */
-deprecated predicate isStatic(Property prop) { is_static(prop) }
-
-/**
- * Alias for the predicate `is_abstract_member` defined in the .dbscheme.
- * Use `MemberDeclaration#isAbstract()` instead.
- */
-deprecated predicate isAbstractMember(Property prop) { is_abstract_member(prop) }
-
-/**
- * Alias for the predicate `is_const_enum` defined in the .dbscheme.
- * Use `EnumDeclaration#isConst()` instead.
- */
-deprecated predicate isConstEnum(EnumDeclaration id) { is_const_enum(id) }
-
-/**
- * Alias for the predicate `is_abstract_class` defined in the .dbscheme.
- * Use `ClassDefinition#isAbstract()` instead.
- */
-deprecated predicate isAbstractClass(ClassDeclStmt id) { is_abstract_class(id) }
-
-/**
- * Alias for the predicate `has_public_keyword` defined in the .dbscheme.
- * Use `MemberDeclaration#hasPublicKeyword() instead.
- */
-deprecated predicate hasPublicKeyword(Property prop) { has_public_keyword(prop) }
-
-/**
- * Alias for the predicate `has_private_keyword` defined in the .dbscheme.
- * Use `MemberDeclaration#isPrivate() instead.
- */
-deprecated predicate hasPrivateKeyword(Property prop) { has_private_keyword(prop) }
-
-/**
- * Alias for the predicate `has_protected_keyword` defined in the .dbscheme.
- * Use `MemberDeclaration#isProtected() instead.
- */
-deprecated predicate hasProtectedKeyword(Property prop) { has_protected_keyword(prop) }
-
-/**
- * Alias for the predicate `has_readonly_keyword` defined in the .dbscheme.
- * Use `FieldDeclaration#isReadonly()` instead.
- */
-deprecated predicate hasReadonlyKeyword(Property prop) { has_readonly_keyword(prop) }
-
-/**
- * Alias for the predicate `has_type_keyword` defined in the .dbscheme.
- * Use the `isTypeOnly` method on the `ImportDeclaration`/`ExportDeclaration` classes instead.
- */
-deprecated predicate hasTypeKeyword(ASTNode id) { has_type_keyword(id) }
-
-/**
- * Alias for the predicate `is_optional_member` defined in the .dbscheme.
- * Use `FieldDeclaration#isOptional()` instead.
- */
-deprecated predicate isOptionalMember(Property id) { is_optional_member(id) }
-
-/**
- * Alias for the predicate `has_definite_assignment_assertion` defined in the .dbscheme.
- * Use the `hasDefiniteAssignmentAssertion` method on the `FieldDeclaration`/`VariableDeclarator` classes instead.
- */
-deprecated predicate hasDefiniteAssignmentAssertion(ASTNode id) {
-  has_definite_assignment_assertion(id)
-}
-
-/**
- * Alias for the predicate `is_optional_parameter_declaration` defined in the .dbscheme.
- * Use `Parameter#isDeclaredOptional()` instead.
- */
-deprecated predicate isOptionalParameterDeclaration(Parameter parameter) {
-  is_optional_parameter_declaration(parameter)
-}
-
-/**
- * Alias for the predicate `has_asserts_keyword` defined in the .dbscheme.
- * Use `PredicateTypeExpr#hasAssertsKeyword() instead.
- */
-deprecated predicate hasAssertsKeyword(PredicateTypeExpr node) { has_asserts_keyword(node) }
-
-/**
- * Alias for the predicate `js_parse_errors` defined in the .dbscheme.
- * Use the `JSParseError` class instead.
- */
-deprecated predicate jsParseErrors(JSParseError id, TopLevel toplevel, string message, string line) {
-  js_parse_errors(id, toplevel, message, line)
-}
-
-/**
- * Alias for the predicate `regexp_parse_errors` defined in the .dbscheme.
- * Use the `RegExpParseError` class instead.
- */
-deprecated predicate regexpParseErrors(RegExpParseError id, RegExpTerm regexp, string message) {
-  regexp_parse_errors(id, regexp, message)
-}
-
-/**
- * Alias for the predicate `is_greedy` defined in the .dbscheme.
- * Use `RegExpQuantifier#isGreedy` instead.
- */
-deprecated predicate isGreedy(RegExpQuantifier id) { is_greedy(id) }
-
-/**
- * Alias for the predicate `range_quantifier_lower_bound` defined in the .dbscheme.
- * Use `RegExpRange#getLowerBound()` instead.
- */
-deprecated predicate rangeQuantifierLowerBound(RegExpRange id, int lo) {
-  range_quantifier_lower_bound(id, lo)
-}
-
-/**
- * Alias for the predicate `range_quantifier_upper_bound` defined in the .dbscheme.
- * Use `RegExpRange#getUpperBound() instead.
- */
-deprecated predicate rangeQuantifierUpperBound(RegExpRange id, int hi) {
-  range_quantifier_upper_bound(id, hi)
-}
-
-/**
- * Alias for the predicate `is_capture` defined in the .dbscheme.
- * Use `RegExpGroup#isCapture()` instead.
- */
-deprecated predicate isCapture(RegExpGroup id, int number) { is_capture(id, number) }
-
-/**
- * Alias for the predicate `is_named_capture` defined in the .dbscheme.
- * Use `RegExpGroup#isNamed()` instead.
- */
-deprecated predicate isNamedCapture(RegExpGroup id, string name) { is_named_capture(id, name) }
-
-/**
- * Alias for the predicate `is_inverted` defined in the .dbscheme.
- * Use `RegExpCharacterClass#isInverted()` instead.
- */
-deprecated predicate isInverted(RegExpCharacterClass id) { is_inverted(id) }
-
-/**
- * Alias for the predicate `regexp_const_value` defined in the .dbscheme.
- * Use `RegExpConstant#getValue()` instead.
- */
-deprecated predicate regexpConstValue(RegExpConstant id, string value) {
-  regexp_const_value(id, value)
-}
-
-/**
- * Alias for the predicate `char_class_escape` defined in the .dbscheme.
- * Use `RegExpCharacterClassEscape#getValue()` instead.
- */
-deprecated predicate charClassEscape(RegExpCharacterClassEscape id, string value) {
-  char_class_escape(id, value)
-}
-
-/**
- * Alias for the predicate `named_backref` defined in the .dbscheme.
- * Use `RegExpBackRef#getName()` instead.
- */
-deprecated predicate namedBackref(RegExpBackRef id, string name) { named_backref(id, name) }
-
-/**
- * Alias for the predicate `unicode_property_escapename` defined in the .dbscheme.
- * Use `RegExpUnicodePropertyEscape#getName()` instead.
- */
-deprecated predicate unicodePropertyEscapeName(RegExpUnicodePropertyEscape id, string name) {
-  unicode_property_escapename(id, name)
-}
-
-/**
- * Alias for the predicate `unicode_property_escapevalue` defined in the .dbscheme.
- * Use `RegExpUnicodePropertyEscape#getValue()` instead.
- */
-deprecated predicate unicodePropertyEscapeValue(RegExpUnicodePropertyEscape id, string value) {
-  unicode_property_escapevalue(id, value)
-}
-
-/**
- * Alias for the predicate `is_generator` defined in the .dbscheme.
- * Use `Function#isGenerator()` instead.
- */
-deprecated predicate isGenerator(Function fun) { is_generator(fun) }
-
-/**
- * Alias for the predicate `has_rest_parameter` defined in the .dbscheme.
- * Use `Function#hasRestParameter()` instead.
- */
-deprecated predicate hasRestParameter(Function fun) { has_rest_parameter(fun) }
-
-/**
- * Alias for the predicate `is_async` defined in the .dbscheme.
- * Use `Function#isAsync()` instead.
- */
-deprecated predicate isAsync(Function fun) { is_async(fun) }
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 57dcf6f2eec..c9c283746db 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -109,7 +109,7 @@ module API {
      */
     cached
     Node getMember(string m) {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::member(m))
     }
 
@@ -119,7 +119,7 @@ module API {
      */
     cached
     Node getUnknownMember() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::unknownMember())
     }
 
@@ -129,7 +129,7 @@ module API {
      */
     cached
     Node getAMember() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getMember(_)
       or
       result = this.getUnknownMember()
@@ -148,7 +148,7 @@ module API {
      */
     cached
     Node getInstance() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::instance())
     }
 
@@ -160,7 +160,7 @@ module API {
      */
     cached
     Node getParameter(int i) {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::parameter(i))
     }
 
@@ -182,7 +182,7 @@ module API {
      */
     cached
     Node getReceiver() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::receiver())
     }
 
@@ -196,7 +196,7 @@ module API {
      */
     cached
     Node getAParameter() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getParameter(_)
       or
       result = this.getReceiver()
@@ -210,7 +210,7 @@ module API {
      */
     cached
     Node getReturn() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::return())
     }
 
@@ -220,7 +220,7 @@ module API {
      */
     cached
     Node getPromised() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::promised())
     }
 
@@ -229,7 +229,7 @@ module API {
      */
     cached
     Node getPromisedError() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::promisedError())
     }
 
@@ -892,7 +892,7 @@ module API {
      */
     cached
     predicate edge(TApiNode pred, Label::ApiLabel lbl, TApiNode succ) {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       exists(string m |
         pred = MkRoot() and
         lbl = Label::moduleLabel(m)
@@ -1251,7 +1251,7 @@ private predicate exports(string m, string prop, DataFlow::Node rhs) {
 
 /** Gets the definition of module `m`. */
 private Module importableModule(string m) {
-  exists(NPMPackage pkg, PackageJSON json | json = pkg.getPackageJSON() and not json.isPrivate() |
+  exists(NpmPackage pkg, PackageJson json | json = pkg.getPackageJson() and not json.isPrivate() |
     result = pkg.getMainModule() and
     not result.isExterns() and
     m = pkg.getPackageName()
diff --git a/javascript/ql/lib/semmle/javascript/Arrays.qll b/javascript/ql/lib/semmle/javascript/Arrays.qll
index 8461c44d699..bc0af1a06fd 100644
--- a/javascript/ql/lib/semmle/javascript/Arrays.qll
+++ b/javascript/ql/lib/semmle/javascript/Arrays.qll
@@ -152,15 +152,12 @@ private module ArrayDataFlow {
   /**
    * A node that reads or writes an element from an array inside a for-loop.
    */
-  private class ArrayIndexingAccess extends DataFlow::Node {
-    DataFlow::PropRef read;
-
+  private class ArrayIndexingAccess extends DataFlow::Node instanceof DataFlow::PropRef {
     ArrayIndexingAccess() {
-      read = this and
       TTNumber() =
-        unique(InferredType type | type = read.getPropertyNameExpr().flow().analyze().getAType()) and
+        unique(InferredType type | type = super.getPropertyNameExpr().flow().analyze().getAType()) and
       exists(VarAccess i, ExprOrVarDecl init |
-        i = read.getPropertyNameExpr() and init = any(ForStmt f).getInit()
+        i = super.getPropertyNameExpr() and init = any(ForStmt f).getInit()
       |
         i.getVariable().getADefinition() = init or
         i.getVariable().getADefinition().(VariableDeclarator).getDeclStmt() = init
diff --git a/javascript/ql/lib/semmle/javascript/CFG.qll b/javascript/ql/lib/semmle/javascript/CFG.qll
index a37fedc1ec0..4daf849bc3d 100644
--- a/javascript/ql/lib/semmle/javascript/CFG.qll
+++ b/javascript/ql/lib/semmle/javascript/CFG.qll
@@ -347,7 +347,7 @@ class ControlFlowNode extends @cfg_node, Locatable, NodeInStmtContainer {
     then result = "function in " + any(MethodDeclaration mem | mem.getBody() = this)
     else
       if this instanceof @decorator_list
-      then result = "parameter decorators of " + this.(ASTNode).getParent().(Function).describe()
+      then result = "parameter decorators of " + this.(AstNode).getParent().(Function).describe()
       else result = toString()
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/CanonicalNames.qll b/javascript/ql/lib/semmle/javascript/CanonicalNames.qll
index 7435be7131a..fc25314af95 100644
--- a/javascript/ql/lib/semmle/javascript/CanonicalNames.qll
+++ b/javascript/ql/lib/semmle/javascript/CanonicalNames.qll
@@ -48,7 +48,7 @@ class CanonicalName extends @symbol {
   string getExternalModuleName() {
     symbol_module(this, result)
     or
-    exists(PackageJSON pkg |
+    exists(PackageJson pkg |
       getModule() = pkg.getMainModule() and
       result = pkg.getPackageName()
     )
@@ -160,7 +160,7 @@ class CanonicalName extends @symbol {
   /**
    * Gets a definition of the entity with this canonical name.
    */
-  ASTNode getADefinition() { none() }
+  AstNode getADefinition() { none() }
 
   /**
    * Gets a use that refers to the entity with this canonical name.
diff --git a/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll b/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll
index 6f95ed1c30a..1a19112cee3 100644
--- a/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll
+++ b/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll
@@ -32,7 +32,7 @@ module CharacterEscapes {
    * Holds if `n` is delimited by `delim` and contains `rawStringNode` with the raw string value `raw`.
    */
   private predicate hasRawStringAndQuote(
-    DataFlow::ValueNode n, string delim, ASTNode rawStringNode, string raw
+    DataFlow::ValueNode n, string delim, AstNode rawStringNode, string raw
   ) {
     rawStringNode = n.asExpr() and
     raw = rawStringNode.(StringLiteral).getRawValue() and
@@ -52,7 +52,7 @@ module CharacterEscapes {
    *
    * The character is the `i`th character of `rawStringNode`'s raw string value.
    */
-  string getAnIdentityEscapedCharacter(DataFlow::Node n, ASTNode rawStringNode, int i) {
+  string getAnIdentityEscapedCharacter(DataFlow::Node n, AstNode rawStringNode, int i) {
     exists(string delim, string raw, string additionalEscapeChars |
       hasRawStringAndQuote(n, delim, rawStringNode, raw) and
       if rawStringNode instanceof RegExpLiteral
@@ -80,7 +80,7 @@ module CharacterEscapes {
    * The character is the `i`th character of the raw string value of `rawStringNode`.
    */
   string getALikelyRegExpPatternMistake(
-    RegExpPatternSource src, string mistake, ASTNode rawStringNode, int i
+    RegExpPatternSource src, string mistake, AstNode rawStringNode, int i
   ) {
     result = getAnIdentityEscapedCharacter(src, rawStringNode, i) and
     (
diff --git a/javascript/ql/lib/semmle/javascript/DOM.qll b/javascript/ql/lib/semmle/javascript/DOM.qll
index 67f75ce7fa9..bca70363c67 100644
--- a/javascript/ql/lib/semmle/javascript/DOM.qll
+++ b/javascript/ql/lib/semmle/javascript/DOM.qll
@@ -76,10 +76,10 @@ module DOM {
   /**
    * A JSX element, viewed as an `ElementDefinition`.
    */
-  private class JsxElementDefinition extends ElementDefinition, @jsx_element instanceof JSXElement {
-    override string getName() { result = JSXElement.super.getName() }
+  private class JsxElementDefinition extends ElementDefinition, @jsx_element instanceof JsxElement {
+    override string getName() { result = JsxElement.super.getName() }
 
-    override AttributeDefinition getAttribute(int i) { result = JSXElement.super.getAttribute(i) }
+    override AttributeDefinition getAttribute(int i) { result = JsxElement.super.getAttribute(i) }
 
     override ElementDefinition getParent() { result = super.getJsxParent() }
   }
@@ -139,7 +139,7 @@ module DOM {
    * A JSX attribute, viewed as an `AttributeDefinition`.
    */
   private class JsxAttributeDefinition extends AttributeDefinition, @jsx_attribute {
-    JSXAttribute attr;
+    JsxAttribute attr;
 
     JsxAttributeDefinition() { this = attr }
 
@@ -323,7 +323,7 @@ module DOM {
 
     private class DefaultRange extends Range {
       DefaultRange() {
-        this.asExpr().(VarAccess).getVariable() instanceof DOMGlobalVariable
+        this.asExpr().(VarAccess).getVariable() instanceof DomGlobalVariable
         or
         exists(DataFlow::PropRead read |
           this = read and
@@ -392,7 +392,7 @@ module DOM {
    */
   private DataFlow::SourceNode domEventSource() {
     // e.g. <form onSubmit={e => e.target}/>
-    exists(JSXAttribute attr | attr.getName().matches("on%") |
+    exists(JsxAttribute attr | attr.getName().matches("on%") |
       result = attr.getValue().flow().getABoundFunctionValue(0).getParameter(0)
     )
     or
diff --git a/javascript/ql/lib/semmle/javascript/DefUse.qll b/javascript/ql/lib/semmle/javascript/DefUse.qll
index 6fa0b438370..a36c682d766 100644
--- a/javascript/ql/lib/semmle/javascript/DefUse.qll
+++ b/javascript/ql/lib/semmle/javascript/DefUse.qll
@@ -249,8 +249,9 @@ class VarUse extends ControlFlowNode, @varref {
 /**
  * Holds if the definition of `v` in `def` reaches `use` along some control flow path
  * without crossing another definition of `v`.
+ * DEPRECATED: Use the `SSA.qll` library instead.
  */
-predicate definitionReaches(Variable v, VarDef def, VarUse use) {
+deprecated predicate definitionReaches(Variable v, VarDef def, VarUse use) {
   v = use.getVariable() and
   exists(BasicBlock bb, int i, int next | next = nextDefAfter(bb, v, i, def) |
     exists(int j | j in [i + 1 .. next - 1] | bb.useAt(j, v, use))
@@ -265,16 +266,20 @@ predicate definitionReaches(Variable v, VarDef def, VarUse use) {
 /**
  * Holds if the definition of local variable `v` in `def` reaches `use` along some control flow path
  * without crossing another definition of `v`.
+ * DEPRECATED: Use the `SSA.qll` library instead.
  */
-predicate localDefinitionReaches(LocalVariable v, VarDef def, VarUse use) {
+deprecated predicate localDefinitionReaches(LocalVariable v, VarDef def, VarUse use) {
   exists(SsaExplicitDefinition ssa |
     ssa.defines(def, v) and
     ssa = getAPseudoDefinitionInput*(use.getSsaVariable().getDefinition())
   )
 }
 
-/** Holds if `nd` is a pseudo-definition and the result is one of its inputs. */
-private SsaDefinition getAPseudoDefinitionInput(SsaDefinition nd) {
+/**
+ * Holds if `nd` is a pseudo-definition and the result is one of its inputs.
+ * DEPRECATED: Use the `SSA.qll` library instead.
+ */
+deprecated private SsaDefinition getAPseudoDefinitionInput(SsaDefinition nd) {
   result = nd.(SsaPseudoDefinition).getAnInput()
 }
 
@@ -282,7 +287,7 @@ private SsaDefinition getAPseudoDefinitionInput(SsaDefinition nd) {
  * Holds if `d` is a definition of `v` at index `i` in `bb`, and the result is the next index
  * in `bb` after `i` at which the same variable is defined, or `bb.length()` if there is none.
  */
-private int nextDefAfter(BasicBlock bb, Variable v, int i, VarDef d) {
+deprecated private int nextDefAfter(BasicBlock bb, Variable v, int i, VarDef d) {
   bb.defAt(i, v, d) and
   result =
     min(int jj |
@@ -296,8 +301,9 @@ private int nextDefAfter(BasicBlock bb, Variable v, int i, VarDef d) {
  *
  * This is the case if there is a path from `earlier` to `later` that does not cross
  * another definition of `v`.
+ * DEPRECATED: Use the `SSA.qll` library instead.
  */
-predicate localDefinitionOverwrites(LocalVariable v, VarDef earlier, VarDef later) {
+deprecated predicate localDefinitionOverwrites(LocalVariable v, VarDef earlier, VarDef later) {
   exists(BasicBlock bb, int i, int next | next = nextDefAfter(bb, v, i, earlier) |
     bb.defAt(next, v, later)
     or
diff --git a/javascript/ql/lib/semmle/javascript/DynamicPropertyAccess.qll b/javascript/ql/lib/semmle/javascript/DynamicPropertyAccess.qll
index b7308ca5ad4..0a647964ccf 100644
--- a/javascript/ql/lib/semmle/javascript/DynamicPropertyAccess.qll
+++ b/javascript/ql/lib/semmle/javascript/DynamicPropertyAccess.qll
@@ -181,16 +181,7 @@ class DynamicPropRead extends DataFlow::SourceNode, DataFlow::ValueNode {
    * dst[x][y] = src[y];
    * ```
    */
-  predicate hasDominatingAssignment() {
-    exists(DataFlow::PropWrite write, BasicBlock bb, int i, int j, SsaVariable ssaVar |
-      write = getBase().getALocalSource().getAPropertyWrite() and
-      bb.getNode(i) = write.getWriteNode() and
-      bb.getNode(j) = astNode and
-      i < j and
-      write.getPropertyNameExpr() = ssaVar.getAUse() and
-      astNode.getIndex() = ssaVar.getAUse()
-    )
-  }
+  predicate hasDominatingAssignment() { AccessPath::DominatingPaths::hasDominatingWrite(this) }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/E4X.qll b/javascript/ql/lib/semmle/javascript/E4X.qll
index e8e224e1e51..f69990138c8 100644
--- a/javascript/ql/lib/semmle/javascript/E4X.qll
+++ b/javascript/ql/lib/semmle/javascript/E4X.qll
@@ -14,7 +14,10 @@ module E4X {
    * *
    * ```
    */
-  class XMLAnyName extends Expr, @e4x_xml_anyname { }
+  class XmlAnyName extends Expr, @e4x_xml_anyname { }
+
+  /** DEPRECATED: Alias for XmlAnyName */
+  deprecated class XMLAnyName = XmlAnyName;
 
   /**
    * An E4X qualified identifier.
@@ -29,7 +32,7 @@ module E4X {
    * Note that qualified identifiers are not currently supported by the parser, so snapshots
    * will not usually contain any.
    */
-  class XMLQualifiedIdentifier extends Expr, @e4x_xml_qualident {
+  class XmlQualifiedIdentifier extends Expr, @e4x_xml_qualident {
     /**
      * Gets the left operand of this qualified identifier, which is either
      * an identifier or a wildcard.
@@ -54,6 +57,9 @@ module E4X {
     }
   }
 
+  /** DEPRECATED: Alias for XmlQualifiedIdentifier */
+  deprecated class XMLQualifiedIdentifier = XmlQualifiedIdentifier;
+
   /**
    * An E4X attribute selector.
    *
@@ -64,7 +70,7 @@ module E4X {
    * @[p]
    * ```
    */
-  class XMLAttributeSelector extends Expr, @e4x_xml_attribute_selector {
+  class XmlAttributeSelector extends Expr, @e4x_xml_attribute_selector {
     /**
      * Gets the selected attribute, which is either a static name (that is, a
      * wildcard identifier or a possibly qualified name), or an arbitrary
@@ -83,6 +89,9 @@ module E4X {
     }
   }
 
+  /** DEPRECATED: Alias for XmlAttributeSelector */
+  deprecated class XMLAttributeSelector = XmlAttributeSelector;
+
   /**
    * An E4X filter expression.
    *
@@ -92,7 +101,7 @@ module E4X {
    * employees.(@id == 0 || @id == 1)
    * ```
    */
-  class XMLFilterExpression extends Expr, @e4x_xml_filter_expression {
+  class XmlFilterExpression extends Expr, @e4x_xml_filter_expression {
     /**
      * Gets the left operand of this filter expression.
      */
@@ -108,6 +117,9 @@ module E4X {
     }
   }
 
+  /** DEPRECATED: Alias for XmlFilterExpression */
+  deprecated class XMLFilterExpression = XmlFilterExpression;
+
   /**
    * An E4X "dot-dot" expression.
    *
@@ -117,7 +129,7 @@ module E4X {
    * e..name
    * ```
    */
-  class XMLDotDotExpression extends Expr, @e4x_xml_dotdotexpr {
+  class XmlDotDotExpression extends Expr, @e4x_xml_dotdotexpr {
     /**
      * Gets the base expression of this dot-dot expression.
      */
@@ -132,4 +144,7 @@ module E4X {
       result = getBase().getFirstControlFlowNode()
     }
   }
+
+  /** DEPRECATED: Alias for XmlDotDotExpression */
+  deprecated class XMLDotDotExpression = XmlDotDotExpression;
 }
diff --git a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
index 4a8777d46ec..7ee6311393b 100644
--- a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
@@ -647,13 +647,6 @@ abstract class ReExportDeclaration extends ExportDeclaration {
   /** Gets the path of the module from which this declaration re-exports. */
   abstract ConstantString getImportedPath();
 
-  /**
-   * DEPRECATED. Use `getReExportedES2015Module()` instead.
-   *
-   * Gets the module from which this declaration re-exports.
-   */
-  deprecated ES2015Module getImportedModule() { result = getReExportedModule() }
-
   /** Gets the module from which this declaration re-exports, if it is an ES2015 module. */
   ES2015Module getReExportedES2015Module() { result = getReExportedModule() }
 
diff --git a/javascript/ql/lib/semmle/javascript/Expr.qll b/javascript/ql/lib/semmle/javascript/Expr.qll
index b99b4c71be8..69dbdd11451 100644
--- a/javascript/ql/lib/semmle/javascript/Expr.qll
+++ b/javascript/ql/lib/semmle/javascript/Expr.qll
@@ -2744,7 +2744,7 @@ class Decorator extends @decorator, Expr {
  * }
  * ```
  */
-class Decoratable extends ASTNode {
+class Decoratable extends AstNode {
   Decoratable() {
     this instanceof ClassDefinition or
     this instanceof Property or
diff --git a/javascript/ql/lib/semmle/javascript/Externs.qll b/javascript/ql/lib/semmle/javascript/Externs.qll
index 5fe855a46a8..157b4b3f4cf 100644
--- a/javascript/ql/lib/semmle/javascript/Externs.qll
+++ b/javascript/ql/lib/semmle/javascript/Externs.qll
@@ -64,7 +64,7 @@ import javascript
  * Object.prototype.hasOwnProperty = function(p) {};
  * </pre>
  */
-abstract class ExternalDecl extends ASTNode {
+abstract class ExternalDecl extends AstNode {
   /** Gets the name of this declaration. */
   abstract string getName();
 
@@ -125,7 +125,7 @@ abstract class ExternalVarDecl extends ExternalDecl {
    *
    * The result can be either a function or an expression.
    */
-  abstract ASTNode getInit();
+  abstract AstNode getInit();
 
   /**
    * Gets a JSDoc tag associated with this declaration.
@@ -179,7 +179,7 @@ class ExternalGlobalFunctionDecl extends ExternalGlobalDecl, FunctionDeclStmt {
   /** Gets the name of this declaration. */
   override string getName() { result = FunctionDeclStmt.super.getName() }
 
-  override ASTNode getInit() { result = this }
+  override AstNode getInit() { result = this }
 }
 
 /**
@@ -336,7 +336,7 @@ class ExternalInstanceMemberDecl extends ExternalMemberDecl {
  *   function(p) {};  // external function entity
  * </pre>
  */
-class ExternalEntity extends ASTNode {
+class ExternalEntity extends AstNode {
   ExternalEntity() { exists(ExternalVarDecl d | d.getInit() = this) }
 
   /** Gets the variable declaration to which this entity belongs. */
diff --git a/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll b/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll
index 924e8f0a166..967729d3fd4 100644
--- a/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll
+++ b/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll
@@ -7,31 +7,6 @@ private import semmle.javascript.dataflow.InferredTypes
 private import semmle.javascript.dataflow.internal.FlowSteps as FlowSteps
 private import semmle.javascript.internal.CachedStages
 
-deprecated module GlobalAccessPath {
-  /**
-   * DEPRECATED. Instead use `AccessPath::getAReferenceTo` with the result and parameter reversed.
-   */
-  pragma[inline]
-  string fromReference(DataFlow::Node node) { node = AccessPath::getAReferenceTo(result) }
-
-  /**
-   * DEPRECATED. Instead use `AccessPath::getAnAssignmentTo` with the result and parameter reversed.
-   */
-  pragma[inline]
-  string fromRhs(DataFlow::Node node) { node = AccessPath::getAnAssignmentTo(result) }
-
-  /**
-   * DEPRECATED. Use `AccessPath::getAReferenceOrAssignmentTo`.
-   */
-  pragma[inline]
-  string getAccessPath(DataFlow::Node node) {
-    result = fromReference(node)
-    or
-    not exists(fromReference(node)) and
-    result = fromRhs(node)
-  }
-}
-
 /**
  * Provides predicates for associating access paths with data flow nodes.
  *
@@ -557,7 +532,7 @@ module AccessPath {
      */
     cached
     predicate hasDominatingWrite(DataFlow::PropRead read) {
-      Stages::FlowSteps::ref() and
+      Stages::TypeTracking::ref() and
       // within the same basic block.
       exists(ReachableBasicBlock bb, Root root, string path, int ranking |
         read.asExpr() = rankedAccessPath(bb, root, path, ranking, AccessPathRead()) and
@@ -569,6 +544,21 @@ module AccessPath {
         read.asExpr() = getAccessTo(root, path, AccessPathRead()) and
         getAWriteBlock(root, path).strictlyDominates(read.getBasicBlock())
       )
+      or
+      // Dynamic write where the same variable is used to index the read and write (in the same basic block)
+      // For example, this is true for `dst[x]` on line 2 below:
+      // ```js
+      // dst[x] = {};
+      // dst[x][y] = src[y];
+      // ```
+      exists(DataFlow::PropWrite write, BasicBlock bb, int i, int j, SsaVariable ssaVar |
+        write = read.getBase().getALocalSource().getAPropertyWrite() and
+        bb.getNode(i) = write.getWriteNode() and
+        bb.getNode(j) = read.asExpr() and
+        i < j and
+        write.getPropertyNameExpr() = ssaVar.getAUse() and
+        read.getPropertyNameExpr() = ssaVar.getAUse()
+      )
     }
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/JSDoc.qll b/javascript/ql/lib/semmle/javascript/JSDoc.qll
index 2621c92e3c6..b2b7548886f 100644
--- a/javascript/ql/lib/semmle/javascript/JSDoc.qll
+++ b/javascript/ql/lib/semmle/javascript/JSDoc.qll
@@ -55,7 +55,7 @@ class JSDoc extends @jsdoc, Locatable {
  * }
  * </pre>
  */
-abstract class Documentable extends ASTNode {
+abstract class Documentable extends AstNode {
   /** Gets the JSDoc comment for this element, if any. */
   cached
   JSDoc getDocumentation() {
diff --git a/javascript/ql/lib/semmle/javascript/JSON.qll b/javascript/ql/lib/semmle/javascript/JSON.qll
index ed3f6f69637..d474965051e 100644
--- a/javascript/ql/lib/semmle/javascript/JSON.qll
+++ b/javascript/ql/lib/semmle/javascript/JSON.qll
@@ -19,14 +19,14 @@ import javascript
  * { "value": 0 }
  * ```
  */
-class JSONValue extends @json_value, Locatable {
+class JsonValue extends @json_value, Locatable {
   override Location getLocation() { json_locations(this, result) }
 
   /** Gets the parent value to which this value belongs, if any. */
-  JSONValue getParent() { json(this, _, result, _, _) }
+  JsonValue getParent() { json(this, _, result, _, _) }
 
   /** Gets the `i`th child value of this value. */
-  JSONValue getChild(int i) { json(result, _, this, i, _) }
+  JsonValue getChild(int i) { json(result, _, this, i, _) }
 
   /** Holds if this JSON value is the top level element in its enclosing file. */
   predicate isTopLevel() { not exists(getParent()) }
@@ -42,23 +42,26 @@ class JSONValue extends @json_value, Locatable {
   }
 
   /** If this is an object, gets the value of property `name`. */
-  JSONValue getPropValue(string name) { json_properties(this, name, result) }
+  JsonValue getPropValue(string name) { json_properties(this, name, result) }
 
   /** If this is an array, gets the value of the `i`th element. */
-  JSONValue getElementValue(int i) { result = this.(JSONArray).getChild(i) }
+  JsonValue getElementValue(int i) { result = this.(JsonArray).getChild(i) }
 
   /** If this is a string constant, gets the value of the string. */
-  string getStringValue() { result = this.(JSONString).getValue() }
+  string getStringValue() { result = this.(JsonString).getValue() }
 
   /** If this is an integer constant, gets its numeric value. */
-  int getIntValue() { result = this.(JSONNumber).getValue().toInt() }
+  int getIntValue() { result = this.(JsonNumber).getValue().toInt() }
 
   /** If this is a boolean constant, gets its boolean value. */
-  boolean getBooleanValue() { result.toString() = this.(JSONBoolean).getValue() }
+  boolean getBooleanValue() { result.toString() = this.(JsonBoolean).getValue() }
 
-  override string getAPrimaryQlClass() { result = "JSONValue" }
+  override string getAPrimaryQlClass() { result = "JsonValue" }
 }
 
+/** DEPRECATED: Alias for JsonValue */
+deprecated class JSONValue = JsonValue;
+
 /**
  * A JSON-encoded primitive value.
  *
@@ -72,7 +75,7 @@ class JSONValue extends @json_value, Locatable {
  * "a string"
  * ```
  */
-abstract class JSONPrimitiveValue extends JSONValue {
+abstract class JsonPrimitiveValue extends JsonValue {
   /** Gets a string representation of the encoded value. */
   string getValue() { json_literals(result, _, this) }
 
@@ -80,6 +83,9 @@ abstract class JSONPrimitiveValue extends JSONValue {
   string getRawValue() { json_literals(_, result, this) }
 }
 
+/** DEPRECATED: Alias for JsonPrimitiveValue */
+deprecated class JSONPrimitiveValue = JsonPrimitiveValue;
+
 /**
  * A JSON-encoded null value.
  *
@@ -89,10 +95,13 @@ abstract class JSONPrimitiveValue extends JSONValue {
  * null
  * ```
  */
-class JSONNull extends @json_null, JSONPrimitiveValue {
-  override string getAPrimaryQlClass() { result = "JSONNull" }
+class JsonNull extends @json_null, JsonPrimitiveValue {
+  override string getAPrimaryQlClass() { result = "JsonNull" }
 }
 
+/** DEPRECATED: Alias for JsonNull */
+deprecated class JSONNull = JsonNull;
+
 /**
  * A JSON-encoded Boolean value.
  *
@@ -103,10 +112,13 @@ class JSONNull extends @json_null, JSONPrimitiveValue {
  * false
  * ```
  */
-class JSONBoolean extends @json_boolean, JSONPrimitiveValue {
-  override string getAPrimaryQlClass() { result = "JSONBoolean" }
+class JsonBoolean extends @json_boolean, JsonPrimitiveValue {
+  override string getAPrimaryQlClass() { result = "JsonBoolean" }
 }
 
+/** DEPRECATED: Alias for JsonBoolean */
+deprecated class JSONBoolean = JsonBoolean;
+
 /**
  * A JSON-encoded number.
  *
@@ -117,10 +129,13 @@ class JSONBoolean extends @json_boolean, JSONPrimitiveValue {
  * 1.0
  * ```
  */
-class JSONNumber extends @json_number, JSONPrimitiveValue {
-  override string getAPrimaryQlClass() { result = "JSONNumber" }
+class JsonNumber extends @json_number, JsonPrimitiveValue {
+  override string getAPrimaryQlClass() { result = "JsonNumber" }
 }
 
+/** DEPRECATED: Alias for JsonNumber */
+deprecated class JSONNumber = JsonNumber;
+
 /**
  * A JSON-encoded string value.
  *
@@ -130,10 +145,13 @@ class JSONNumber extends @json_number, JSONPrimitiveValue {
  * "a string"
  * ```
  */
-class JSONString extends @json_string, JSONPrimitiveValue {
-  override string getAPrimaryQlClass() { result = "JSONString" }
+class JsonString extends @json_string, JsonPrimitiveValue {
+  override string getAPrimaryQlClass() { result = "JsonString" }
 }
 
+/** DEPRECATED: Alias for JsonString */
+deprecated class JSONString = JsonString;
+
 /**
  * A JSON-encoded array.
  *
@@ -143,13 +161,16 @@ class JSONString extends @json_string, JSONPrimitiveValue {
  * [ 1, 2, 3 ]
  * ```
  */
-class JSONArray extends @json_array, JSONValue {
-  override string getAPrimaryQlClass() { result = "JSONArray" }
+class JsonArray extends @json_array, JsonValue {
+  override string getAPrimaryQlClass() { result = "JsonArray" }
 
   /** Gets the string value of the `i`th element of this array. */
   string getElementStringValue(int i) { result = getElementValue(i).getStringValue() }
 }
 
+/** DEPRECATED: Alias for JsonArray */
+deprecated class JSONArray = JsonArray;
+
 /**
  * A JSON-encoded object.
  *
@@ -159,18 +180,24 @@ class JSONArray extends @json_array, JSONValue {
  * { "value": 0 }
  * ```
  */
-class JSONObject extends @json_object, JSONValue {
-  override string getAPrimaryQlClass() { result = "JSONObject" }
+class JsonObject extends @json_object, JsonValue {
+  override string getAPrimaryQlClass() { result = "JsonObject" }
 
   /** Gets the string value of property `name` of this object. */
   string getPropStringValue(string name) { result = getPropValue(name).getStringValue() }
 }
 
+/** DEPRECATED: Alias for JsonObject */
+deprecated class JSONObject = JsonObject;
+
 /**
  * An error reported by the JSON parser.
  */
-class JSONParseError extends @json_parse_error, Error {
+class JsonParseError extends @json_parse_error, Error {
   override Location getLocation() { json_locations(this, result) }
 
   override string getMessage() { json_errors(this, result) }
 }
+
+/** DEPRECATED: Alias for JsonParseError */
+deprecated class JSONParseError = JsonParseError;
diff --git a/javascript/ql/lib/semmle/javascript/JSX.qll b/javascript/ql/lib/semmle/javascript/JSX.qll
index 4080964886e..f89f02abb54 100644
--- a/javascript/ql/lib/semmle/javascript/JSX.qll
+++ b/javascript/ql/lib/semmle/javascript/JSX.qll
@@ -15,7 +15,7 @@ import javascript
  * <><h1>Title</h1>Some <b>text</b></>
  * ```
  */
-class JSXNode extends Expr, @jsx_element {
+class JsxNode extends Expr, @jsx_element {
   /** Gets the `i`th element in the body of this element or fragment. */
   Expr getBodyElement(int i) { i >= 0 and result = getChildExpr(-i - 2) }
 
@@ -25,11 +25,14 @@ class JSXNode extends Expr, @jsx_element {
   /**
    * Gets the parent JSX element or fragment of this element.
    */
-  JSXNode getJsxParent() { this = result.getABodyElement() }
+  JsxNode getJsxParent() { this = result.getABodyElement() }
 
-  override string getAPrimaryQlClass() { result = "JSXNode" }
+  override string getAPrimaryQlClass() { result = "JsxNode" }
 }
 
+/** DEPRECATED: Alias for JsxNode */
+deprecated class JSXNode = JsxNode;
+
 /**
  * A JSX element.
  *
@@ -40,39 +43,45 @@ class JSXNode extends Expr, @jsx_element {
  * <Welcome name={user.name}/>
  * ```
  */
-class JSXElement extends JSXNode {
-  JSXName name;
+class JsxElement extends JsxNode {
+  JsxName name;
 
-  JSXElement() { name = getChildExpr(-1) }
+  JsxElement() { name = getChildExpr(-1) }
 
   /** Gets the expression denoting the name of this element. */
-  JSXName getNameExpr() { result = name }
+  JsxName getNameExpr() { result = name }
 
   /** Gets the name of this element. */
   string getName() { result = name.getValue() }
 
   /** Gets the `i`th attribute of this element. */
-  JSXAttribute getAttribute(int i) { properties(result, this, i, _, _) }
+  JsxAttribute getAttribute(int i) { properties(result, this, i, _, _) }
 
   /** Gets an attribute of this element. */
-  JSXAttribute getAnAttribute() { result = getAttribute(_) }
+  JsxAttribute getAnAttribute() { result = getAttribute(_) }
 
   /** Gets the attribute of this element with the given name, if any. */
-  JSXAttribute getAttributeByName(string n) { result = getAnAttribute() and result.getName() = n }
+  JsxAttribute getAttributeByName(string n) { result = getAnAttribute() and result.getName() = n }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
   }
 
-  override string getAPrimaryQlClass() { result = "JSXElement" }
+  override string getAPrimaryQlClass() { result = "JsxElement" }
 
   /**
    * Holds if this JSX element is a HTML element.
    * That is, the name starts with a lowercase letter.
    */
-  predicate isHTMLElement() { getName().regexpMatch("[a-z].*") }
+  predicate isHtmlElement() { getName().regexpMatch("[a-z].*") }
+
+  /** DEPRECATED: Alias for isHtmlElement */
+  deprecated predicate isHTMLElement() { isHtmlElement() }
 }
 
+/** DEPRECATED: Alias for JsxElement */
+deprecated class JSXElement = JsxElement;
+
 /**
  * A JSX fragment.
  *
@@ -82,8 +91,8 @@ class JSXElement extends JSXNode {
  * <><h1>Title</h1>Some <b>text</b></>
  * ```
  */
-class JSXFragment extends JSXNode {
-  JSXFragment() { not exists(getChildExpr(-1)) }
+class JsxFragment extends JsxNode {
+  JsxFragment() { not exists(getChildExpr(-1)) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getBodyElement(0).getFirstControlFlowNode()
@@ -91,9 +100,12 @@ class JSXFragment extends JSXNode {
     not exists(getABodyElement()) and result = this
   }
 
-  override string getAPrimaryQlClass() { result = "JSXFragment" }
+  override string getAPrimaryQlClass() { result = "JsxFragment" }
 }
 
+/** DEPRECATED: Alias for JsxFragment */
+deprecated class JSXFragment = JsxFragment;
+
 /**
  * An attribute of a JSX element, including spread attributes.
  *
@@ -105,13 +117,13 @@ class JSXFragment extends JSXNode {
  * <div {...attrs}></div>            // `{...attrs}` is a (spread) attribute
  * ```
  */
-class JSXAttribute extends ASTNode, @jsx_attribute {
+class JsxAttribute extends AstNode, @jsx_attribute {
   /**
    * Gets the expression denoting the name of this attribute.
    *
    * This is not defined for spread attributes.
    */
-  JSXName getNameExpr() { result = getChildExpr(0) }
+  JsxName getNameExpr() { result = getChildExpr(0) }
 
   /**
    * Gets the name of this attribute.
@@ -127,7 +139,7 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
   string getStringValue() { result = getValue().getStringValue() }
 
   /** Gets the JSX element to which this attribute belongs. */
-  JSXElement getElement() { this = result.getAnAttribute() }
+  JsxElement getElement() { this = result.getAnAttribute() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
@@ -137,9 +149,12 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
 
   override string toString() { properties(this, _, _, _, result) }
 
-  override string getAPrimaryQlClass() { result = "JSXAttribute" }
+  override string getAPrimaryQlClass() { result = "JsxAttribute" }
 }
 
+/** DEPRECATED: Alias for JsxAttribute */
+deprecated class JSXAttribute = JsxAttribute;
+
 /**
  * A spread attribute of a JSX element.
  *
@@ -149,8 +164,8 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
  * <div {...attrs}></div>            // `{...attrs}` is a spread attribute
  * ```
  */
-class JSXSpreadAttribute extends JSXAttribute {
-  JSXSpreadAttribute() { not exists(getNameExpr()) }
+class JsxSpreadAttribute extends JsxAttribute {
+  JsxSpreadAttribute() { not exists(getNameExpr()) }
 
   override SpreadElement getValue() {
     // override for more precise result type
@@ -158,6 +173,9 @@ class JSXSpreadAttribute extends JSXAttribute {
   }
 }
 
+/** DEPRECATED: Alias for JsxSpreadAttribute */
+deprecated class JSXSpreadAttribute = JsxSpreadAttribute;
+
 /**
  * A namespace-qualified name such as `n:a`.
  *
@@ -167,7 +185,7 @@ class JSXSpreadAttribute extends JSXAttribute {
  * html:href
  * ```
  */
-class JSXQualifiedName extends Expr, @jsx_qualified_name {
+class JsxQualifiedName extends Expr, @jsx_qualified_name {
   /** Gets the namespace component of this qualified name. */
   Identifier getNamespace() { result = getChildExpr(0) }
 
@@ -178,9 +196,12 @@ class JSXQualifiedName extends Expr, @jsx_qualified_name {
     result = getNamespace().getFirstControlFlowNode()
   }
 
-  override string getAPrimaryQlClass() { result = "JSXQualifiedName" }
+  override string getAPrimaryQlClass() { result = "JsxQualifiedName" }
 }
 
+/** DEPRECATED: Alias for JsxQualifiedName */
+deprecated class JSXQualifiedName = JsxQualifiedName;
+
 /**
  * A name of an JSX element or attribute (which is
  * always an identifier, a dot expression, or a qualified
@@ -194,12 +215,12 @@ class JSXQualifiedName extends Expr, @jsx_qualified_name {
  * data.path
  * ```
  */
-class JSXName extends Expr {
-  JSXName() {
+class JsxName extends Expr {
+  JsxName() {
     this instanceof Identifier or
     this instanceof ThisExpr or
-    this.(DotExpr).getBase() instanceof JSXName or
-    this instanceof JSXQualifiedName
+    this.(DotExpr).getBase() instanceof JsxName or
+    this instanceof JsxQualifiedName
   }
 
   /**
@@ -209,10 +230,10 @@ class JSXName extends Expr {
     result = this.(Identifier).getName()
     or
     exists(DotExpr dot | dot = this |
-      result = dot.getBase().(JSXName).getValue() + "." + dot.getPropertyName()
+      result = dot.getBase().(JsxName).getValue() + "." + dot.getPropertyName()
     )
     or
-    exists(JSXQualifiedName qual | qual = this |
+    exists(JsxQualifiedName qual | qual = this |
       result = qual.getNamespace().getName() + ":" + qual.getName().getName()
     )
     or
@@ -221,6 +242,9 @@ class JSXName extends Expr {
   }
 }
 
+/** DEPRECATED: Alias for JsxName */
+deprecated class JSXName = JsxName;
+
 /**
  * An interpolating expression that interpolates nothing.
  *
@@ -230,10 +254,13 @@ class JSXName extends Expr {
  * { /* TBD *&#47; }
  * </pre>
  */
-class JSXEmptyExpr extends Expr, @jsx_empty_expr {
-  override string getAPrimaryQlClass() { result = "JSXEmptyExpr" }
+class JsxEmptyExpr extends Expr, @jsx_empty_expr {
+  override string getAPrimaryQlClass() { result = "JsxEmptyExpr" }
 }
 
+/** DEPRECATED: Alias for JsxEmptyExpr */
+deprecated class JSXEmptyExpr = JsxEmptyExpr;
+
 /**
  * A legacy `@jsx` pragma.
  *
@@ -243,12 +270,18 @@ class JSXEmptyExpr extends Expr, @jsx_empty_expr {
  * @jsx React.DOM
  * ```
  */
-class JSXPragma extends JSDocTag {
-  JSXPragma() { getTitle() = "jsx" }
+class JsxPragma extends JSDocTag {
+  JsxPragma() { getTitle() = "jsx" }
 
   /**
    * Gets the DOM name specified by the pragma; for `@jsx React.DOM`,
    * the result is `React.DOM`.
    */
-  string getDOMName() { result = getDescription().trim() }
+  string getDomName() { result = getDescription().trim() }
+
+  /** DEPRECATED: Alias for getDomName */
+  deprecated string getDOMName() { result = getDomName() }
 }
+
+/** DEPRECATED: Alias for JsxPragma */
+deprecated class JSXPragma = JsxPragma;
diff --git a/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll b/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll
index 8f6edd312cd..03ca152471f 100644
--- a/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll
+++ b/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll
@@ -64,7 +64,7 @@ class JSON2CSVTaintStep extends TaintTracking::SharedTaintStep {
  * This is not quite a `JSON.stringify` call, as it e.g. does not wrap keys in double quotes.
  * It's therefore modeled as a taint-step rather than as a `JSON.stringify` call.
  */
-class PrettyJSONTaintStep extends TaintTracking::SharedTaintStep {
+class PrettyJsonTaintStep extends TaintTracking::SharedTaintStep {
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     exists(API::CallNode call |
       call = API::moduleImport("prettyjson").getMember("render").getACall()
@@ -74,3 +74,6 @@ class PrettyJSONTaintStep extends TaintTracking::SharedTaintStep {
     )
   }
 }
+
+/** DEPRECATED: Alias for PrettyJsonTaintStep */
+deprecated class PrettyJSONTaintStep = PrettyJsonTaintStep;
diff --git a/javascript/ql/lib/semmle/javascript/Modules.qll b/javascript/ql/lib/semmle/javascript/Modules.qll
index 9e2a4ac3fce..8c36044bb24 100644
--- a/javascript/ql/lib/semmle/javascript/Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/Modules.qll
@@ -27,76 +27,6 @@ abstract class Module extends TopLevel {
   /** Gets a symbol exported by this module. */
   string getAnExportedSymbol() { exists(this.getAnExportedValue(result)) }
 
-  /**
-   * DEPRECATED. Use `getAnExportedValue` instead.
-   *
-   * Holds if this module explicitly exports symbol `name` at the
-   * program element `export`.
-   *
-   * Note that in some module systems (notably CommonJS and AMD)
-   * modules are arbitrary objects that export all their
-   * properties. This predicate only considers properties
-   * that are explicitly defined on the module object.
-   *
-   * Symbols defined in another module that are re-exported by
-   * this module are only sometimes considered.
-   */
-  deprecated predicate exports(string name, ASTNode export) {
-    this instanceof AmdModule and
-    exists(DataFlow::PropWrite pwn | export = pwn.getAstNode() |
-      pwn.getBase().analyze().getAValue() = this.(AmdModule).getDefine().getAModuleExportsValue() and
-      name = pwn.getPropertyName()
-    )
-    or
-    this instanceof Closure::ClosureModule and
-    exists(DataFlow::PropWrite write, Expr base |
-      write.getAstNode() = export and
-      write.writes(base.flow(), name, _) and
-      (
-        base = this.(Closure::ClosureModule).getExportsVariable().getAReference()
-        or
-        base = this.(Closure::ClosureModule).getExportsVariable().getAnAssignedExpr()
-      )
-    )
-    or
-    this instanceof NodeModule and
-    (
-      // a property write whose base is `exports` or `module.exports`
-      exists(DataFlow::PropWrite pwn | export = pwn.getAstNode() |
-        pwn.getBase() = this.(NodeModule).getAModuleExportsNode() and
-        name = pwn.getPropertyName()
-      )
-      or
-      // a re-export using spread-operator. E.g. `const foo = require("./foo"); module.exports = {bar: bar, ...foo};`
-      exists(ObjectExpr obj | obj = this.(NodeModule).getAModuleExportsNode().asExpr() |
-        obj.getAProperty()
-            .(SpreadProperty)
-            .getInit()
-            .(SpreadElement)
-            .getOperand()
-            .flow()
-            .getALocalSource()
-            .asExpr()
-            .(Import)
-            .getImportedModule()
-            .exports(name, export)
-      )
-      or
-      // an externs definition (where appropriate)
-      exists(PropAccess pacc | export = pacc |
-        pacc.getBase() = this.(NodeModule).getAModuleExportsNode().asExpr() and
-        name = pacc.getPropertyName() and
-        this.isExterns() and
-        exists(pacc.getDocumentation())
-      )
-    )
-    or
-    this instanceof ES2015Module and
-    exists(ExportDeclaration ed | ed = this.(ES2015Module).getAnExport() and ed = export |
-      ed.exportsAs(_, name)
-    )
-  }
-
   /**
    * Get a value that is explicitly exported from this module with under `name`.
    *
@@ -188,7 +118,7 @@ abstract class Module extends TopLevel {
  * An import in a module, which may be an ECMAScript 2015-style
  * `import` statement, a CommonJS-style `require` import, or an AMD dependency.
  */
-abstract class Import extends ASTNode {
+abstract class Import extends AstNode {
   /** Gets the module in which this import appears. */
   abstract Module getEnclosingModule();
 
@@ -275,26 +205,13 @@ abstract class Import extends ASTNode {
   abstract DataFlow::Node getImportedModuleNode();
 }
 
-/**
- * DEPRECATED. Use `PathExpr` instead.
- *
- * A path expression that appears in a module and is resolved relative to it.
- */
-abstract deprecated class PathExprInModule extends PathExpr {
-  PathExprInModule() {
-    this.(Expr).getTopLevel() instanceof Module
-    or
-    this.(Comment).getTopLevel() instanceof Module
-  }
-}
-
 /**
  * Gets a module imported from another package in the same repository.
  *
  * No support for importing from folders inside the other package.
  */
 private Module resolveNeighbourPackage(PathString importPath) {
-  exists(PackageJSON json | importPath = json.getPackageName() and result = json.getMainModule())
+  exists(PackageJson json | importPath = json.getPackageName() and result = json.getMainModule())
   or
   exists(string package |
     result.getFile().getParentContainer() = getPackageFolder(package) and
@@ -307,7 +224,7 @@ private Module resolveNeighbourPackage(PathString importPath) {
  */
 pragma[noinline]
 private Folder getPackageFolder(string package) {
-  exists(PackageJSON json |
+  exists(PackageJson json |
     json.getPackageName() = package and
     result = json.getFile().getParentContainer()
   )
diff --git a/javascript/ql/lib/semmle/javascript/NPM.qll b/javascript/ql/lib/semmle/javascript/NPM.qll
index 03d62b3aac6..bfd1098d351 100644
--- a/javascript/ql/lib/semmle/javascript/NPM.qll
+++ b/javascript/ql/lib/semmle/javascript/NPM.qll
@@ -6,8 +6,8 @@ import javascript
 private import NodeModuleResolutionImpl
 
 /** A `package.json` configuration object. */
-class PackageJSON extends JSONObject {
-  PackageJSON() {
+class PackageJson extends JsonObject {
+  PackageJson() {
     this.getJsonFile().getBaseName() = "package.json" and
     this.isTopLevel()
   }
@@ -22,7 +22,7 @@ class PackageJSON extends JSONObject {
   string getDescription() { result = this.getPropStringValue("description") }
 
   /** Gets the array of keywords for this package. */
-  JSONArray getKeywords() { result = this.getPropValue("keywords") }
+  JsonArray getKeywords() { result = this.getPropValue("keywords") }
 
   /** Gets a keyword for this package. */
   string getAKeyword() { result = this.getKeywords().getElementStringValue(_) }
@@ -45,7 +45,7 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets the array of files for this package. */
-  JSONArray getFiles() { result = this.getPropValue("files") }
+  JsonArray getFiles() { result = this.getPropValue("files") }
 
   /** Gets a file for this package. */
   string getAFile() { result = this.getFiles().getElementStringValue(_) }
@@ -67,16 +67,16 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets information about the directories of this package. */
-  JSONObject getDirectories() { result = this.getPropValue("directories") }
+  JsonObject getDirectories() { result = this.getPropValue("directories") }
 
   /** Gets repository information for this package. */
   RepositoryInfo getRepository() { result = this.getPropValue("repository") }
 
   /** Gets information about the scripts of this package. */
-  JSONObject getScripts() { result = this.getPropValue("scripts") }
+  JsonObject getScripts() { result = this.getPropValue("scripts") }
 
   /** Gets configuration information for this package. */
-  JSONObject getConfig() { result = this.getPropValue("config") }
+  JsonObject getConfig() { result = this.getPropValue("config") }
 
   /** Gets the dependencies of this package. */
   PackageDependencies getDependencies() { result = this.getPropValue("dependencies") }
@@ -131,10 +131,10 @@ class PackageJSON extends JSONObject {
   PackageDependencies getEngines() { result = this.getPropValue("engines") }
 
   /** Holds if this package has strict engine requirements. */
-  predicate isEngineStrict() { this.getPropValue("engineStrict").(JSONBoolean).getValue() = "true" }
+  predicate isEngineStrict() { this.getPropValue("engineStrict").(JsonBoolean).getValue() = "true" }
 
   /** Gets information about operating systems supported by this package. */
-  JSONArray getOSs() { result = this.getPropValue("os") }
+  JsonArray getOSs() { result = this.getPropValue("os") }
 
   /** Gets an operating system supported by this package. */
   string getWhitelistedOS() {
@@ -150,7 +150,7 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets information about platforms supported by this package. */
-  JSONArray getCPUs() { result = this.getPropValue("cpu") }
+  JsonArray getCPUs() { result = this.getPropValue("cpu") }
 
   /** Gets a platform supported by this package. */
   string getWhitelistedCPU() {
@@ -166,13 +166,13 @@ class PackageJSON extends JSONObject {
   }
 
   /** Holds if this package prefers to be installed globally. */
-  predicate isPreferGlobal() { this.getPropValue("preferGlobal").(JSONBoolean).getValue() = "true" }
+  predicate isPreferGlobal() { this.getPropValue("preferGlobal").(JsonBoolean).getValue() = "true" }
 
   /** Holds if this is a private package. */
-  predicate isPrivate() { this.getPropValue("private").(JSONBoolean).getValue() = "true" }
+  predicate isPrivate() { this.getPropValue("private").(JsonBoolean).getValue() = "true" }
 
   /** Gets publishing configuration information about this package. */
-  JSONValue getPublishConfig() { result = this.getPropValue("publishConfig") }
+  JsonValue getPublishConfig() { result = this.getPropValue("publishConfig") }
 
   /**
    * Gets the main module of this package.
@@ -182,13 +182,16 @@ class PackageJSON extends JSONObject {
   }
 }
 
+/** DEPRECATED: Alias for PackageJson */
+deprecated class PackageJSON = PackageJson;
+
 /**
  * A representation of bug tracker information for an NPM package.
  */
-class BugTrackerInfo extends JSONValue {
+class BugTrackerInfo extends JsonValue {
   BugTrackerInfo() {
-    exists(PackageJSON pkg | pkg.getPropValue("bugs") = this) and
-    (this instanceof JSONObject or this instanceof JSONString)
+    exists(PackageJson pkg | pkg.getPropValue("bugs") = this) and
+    (this instanceof JsonObject or this instanceof JsonString)
   }
 
   /** Gets the bug tracker URL. */
@@ -204,13 +207,13 @@ class BugTrackerInfo extends JSONValue {
 /**
  * A representation of contributor information for an NPM package.
  */
-class ContributorInfo extends JSONValue {
+class ContributorInfo extends JsonValue {
   ContributorInfo() {
-    exists(PackageJSON pkg |
+    exists(PackageJson pkg |
       this = pkg.getPropValue("author") or
       this = pkg.getPropValue("contributors").getElementValue(_)
     ) and
-    (this instanceof JSONObject or this instanceof JSONString)
+    (this instanceof JsonObject or this instanceof JsonString)
   }
 
   /**
@@ -244,8 +247,8 @@ class ContributorInfo extends JSONValue {
 /**
  * A representation of repository information for an NPM package.
  */
-class RepositoryInfo extends JSONObject {
-  RepositoryInfo() { exists(PackageJSON pkg | this = pkg.getPropValue("repository")) }
+class RepositoryInfo extends JsonObject {
+  RepositoryInfo() { exists(PackageJson pkg | this = pkg.getPropValue("repository")) }
 
   /** Gets the repository type. */
   string getType() { result = this.getPropStringValue("type") }
@@ -257,9 +260,9 @@ class RepositoryInfo extends JSONObject {
 /**
  * A representation of package dependencies for an NPM package.
  */
-class PackageDependencies extends JSONObject {
+class PackageDependencies extends JsonObject {
   PackageDependencies() {
-    exists(PackageJSON pkg, string name |
+    exists(PackageJson pkg, string name |
       name.regexpMatch("(.+D|d)ependencies|engines") and
       this = pkg.getPropValue(name)
     )
@@ -272,11 +275,11 @@ class PackageDependencies extends JSONObject {
 /**
  * An NPM package.
  */
-class NPMPackage extends @folder {
+class NpmPackage extends @folder {
   /** The `package.json` file of this package. */
-  PackageJSON pkg;
+  PackageJson pkg;
 
-  NPMPackage() { pkg.getJsonFile().getParentContainer() = this }
+  NpmPackage() { pkg.getJsonFile().getParentContainer() = this }
 
   /** Gets a textual representation of this package. */
   string toString() { result = this.(Folder).toString() }
@@ -285,10 +288,13 @@ class NPMPackage extends @folder {
   string getPath() { result = this.(Folder).getAbsolutePath() }
 
   /** Gets the `package.json` object of this package. */
-  PackageJSON getPackageJSON() { result = pkg }
+  PackageJson getPackageJson() { result = pkg }
+
+  /** DEPRECATED: Alias for getPackageJson */
+  deprecated PackageJSON getPackageJSON() { result = this.getPackageJson() }
 
   /** Gets the name of this package. */
-  string getPackageName() { result = this.getPackageJSON().getPackageName() }
+  string getPackageName() { result = this.getPackageJson().getPackageName() }
 
   /** Gets the `node_modules` folder of this package. */
   Folder getNodeModulesFolder() {
@@ -325,6 +331,9 @@ class NPMPackage extends @folder {
   predicate declaresDependency(string p, string v) { pkg.declaresDependency(p, v) }
 }
 
+/** DEPRECATED: Alias for NpmPackage */
+deprecated class NPMPackage = NpmPackage;
+
 /**
  * Gets the parent folder of `c`, provided that they belong to the same NPM
  * package; that is, `c` must not be a `node_modules` folder.
diff --git a/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll b/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll
index cb2481861ee..6df85792a56 100644
--- a/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll
+++ b/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll
@@ -60,7 +60,7 @@ File loadAsFile(Require req, int rootPriority, int priority) {
  */
 File loadAsDirectory(Require req, int rootPriority, int priority) {
   exists(Folder dir | dir = req.getImportedPath().resolve(rootPriority) |
-    result = resolveMainModule(dir.(NPMPackage).getPackageJSON(), priority) or
+    result = resolveMainModule(dir.(NpmPackage).getPackageJson(), priority) or
     result = tryExtensions(dir, "index", priority - (numberOfExtensions() + 1))
   )
 }
@@ -90,7 +90,7 @@ private string getStem(string name) { result = name.regexpCapture("(.+?)(?:\\.([
 /**
  * Gets the main module described by `pkg` with the given `priority`.
  */
-File resolveMainModule(PackageJSON pkg, int priority) {
+File resolveMainModule(PackageJson pkg, int priority) {
   exists(PathExpr main | main = MainModulePath::of(pkg) |
     result = main.resolve() and priority = 0
     or
@@ -144,14 +144,17 @@ private string getASrcFolderName() { result = ["ts", "js", "src", "lib"] }
  * module of the package.
  */
 class MainModulePath extends PathExpr, @json_string {
-  PackageJSON pkg;
+  PackageJson pkg;
 
   MainModulePath() { this = pkg.getPropValue(["main", "module"]) }
 
   /** Gets the `package.json` file in which this path occurs. */
-  PackageJSON getPackageJSON() { result = pkg }
+  PackageJson getPackageJson() { result = pkg }
 
-  override string getValue() { result = this.(JSONString).getValue() }
+  /** DEPRECATED: Alias for getPackageJson */
+  deprecated PackageJSON getPackageJSON() { result = getPackageJson() }
+
+  override string getValue() { result = this.(JsonString).getValue() }
 
   override Folder getAdditionalSearchRoot(int priority) {
     priority = 0 and
@@ -160,7 +163,7 @@ class MainModulePath extends PathExpr, @json_string {
 }
 
 module MainModulePath {
-  MainModulePath of(PackageJSON pkg) { result.getPackageJSON() = pkg }
+  MainModulePath of(PackageJson pkg) { result.getPackageJson() = pkg }
 }
 
 /**
@@ -169,17 +172,20 @@ module MainModulePath {
  * For performance reasons this only exists if there is no "main" field in the `package.json` file.
  */
 private class FilesPath extends PathExpr, @json_string {
-  PackageJSON pkg;
+  PackageJson pkg;
 
   FilesPath() {
-    this = pkg.getPropValue("files").(JSONArray).getElementValue(_) and
+    this = pkg.getPropValue("files").(JsonArray).getElementValue(_) and
     not exists(MainModulePath::of(pkg))
   }
 
   /** Gets the `package.json` file in which this path occurs. */
-  PackageJSON getPackageJSON() { result = pkg }
+  PackageJson getPackageJson() { result = pkg }
 
-  override string getValue() { result = this.(JSONString).getValue() }
+  /** DEPRECATED: Alias for getPackageJson */
+  deprecated PackageJSON getPackageJSON() { result = getPackageJson() }
+
+  override string getValue() { result = this.(JsonString).getValue() }
 
   override Folder getAdditionalSearchRoot(int priority) {
     priority = 0 and
@@ -188,5 +194,5 @@ private class FilesPath extends PathExpr, @json_string {
 }
 
 private module FilesPath {
-  FilesPath of(PackageJSON pkg) { result.getPackageJSON() = pkg }
+  FilesPath of(PackageJson pkg) { result.getPackageJson() = pkg }
 }
diff --git a/javascript/ql/lib/semmle/javascript/PackageExports.qll b/javascript/ql/lib/semmle/javascript/PackageExports.qll
index 2895ad7232c..82bcb842859 100644
--- a/javascript/ql/lib/semmle/javascript/PackageExports.qll
+++ b/javascript/ql/lib/semmle/javascript/PackageExports.qll
@@ -52,7 +52,7 @@ private import NodeModuleResolutionImpl as NodeModule
 private DataFlow::Node getAValueExportedByPackage() {
   // The base case, an export from a named `package.json` file.
   result =
-    getAnExportFromModule(any(PackageJSON pack | exists(pack.getPackageName())).getMainModule())
+    getAnExportFromModule(any(PackageJson pack | exists(pack.getPackageName())).getMainModule())
   or
   // module.exports.bar.baz = result;
   exists(DataFlow::PropWrite write |
@@ -133,7 +133,7 @@ private DataFlow::Node getAValueExportedByPackage() {
     DataFlow::globalVarRef("define").getACall().getArgument(1) = prev.getALocalUse() and
     func.getFile() =
       min(int j, File f |
-        f = NodeModule::resolveMainModule(any(PackageJSON pack | exists(pack.getPackageName())), j)
+        f = NodeModule::resolveMainModule(any(PackageJson pack | exists(pack.getPackageName())), j)
       |
         f order by j
       )
diff --git a/javascript/ql/lib/semmle/javascript/Paths.qll b/javascript/ql/lib/semmle/javascript/Paths.qll
index 11904b3069e..e22d5ad6132 100644
--- a/javascript/ql/lib/semmle/javascript/Paths.qll
+++ b/javascript/ql/lib/semmle/javascript/Paths.qll
@@ -212,7 +212,7 @@ private module TypeScriptOutDir {
    * Gets a folder of TypeScript files that is compiled to JavaScript files in `outdir` relative to a `parent`.
    */
   string getOriginalTypeScriptFolder(string outdir, Folder parent) {
-    exists(JSONObject tsconfig |
+    exists(JsonObject tsconfig |
       outdir = removeLeadingSlash(getOutDir(tsconfig, parent)) and
       result = removeLeadingSlash(getEffectiveRootDirFromTSConfig(tsconfig))
     )
@@ -229,7 +229,7 @@ private module TypeScriptOutDir {
   /**
    * Gets the `outDir` option from a tsconfig file from the folder `parent`.
    */
-  private string getOutDir(JSONObject tsconfig, Folder parent) {
+  private string getOutDir(JsonObject tsconfig, Folder parent) {
     tsconfig.getFile().getBaseName().regexpMatch("tsconfig.*\\.json") and
     tsconfig.isTopLevel() and
     tsconfig.getFile().getParentContainer() = parent and
@@ -241,7 +241,7 @@ private module TypeScriptOutDir {
    * Based on the tsconfig.json file `tsconfig`.
    */
   pragma[inline]
-  private string getEffectiveRootDirFromTSConfig(JSONObject tsconfig) {
+  private string getEffectiveRootDirFromTSConfig(JsonObject tsconfig) {
     // if an explicit "rootDir" option exists, then use that.
     result = getRootDir(tsconfig)
     or
@@ -273,7 +273,7 @@ private module TypeScriptOutDir {
    * Can have multiple results if the includes are from multiple folders.
    */
   pragma[inline]
-  private string getARootDirFromInclude(JSONObject tsconfig) {
+  private string getARootDirFromInclude(JsonObject tsconfig) {
     result =
       getRootFolderFromPath(tsconfig.getPropValue("include").getElementValue(_).getStringValue())
   }
@@ -282,7 +282,7 @@ private module TypeScriptOutDir {
    * Gets the value of the "rootDir" option from a tsconfig.json.
    */
   pragma[inline]
-  private string getRootDir(JSONObject tsconfig) {
+  private string getRootDir(JsonObject tsconfig) {
     result = tsconfig.getPropValue("compilerOptions").getPropValue("rootDir").getStringValue()
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/PrintAst.qll b/javascript/ql/lib/semmle/javascript/PrintAst.qll
index 98abe183af1..f60b19ccb4e 100644
--- a/javascript/ql/lib/semmle/javascript/PrintAst.qll
+++ b/javascript/ql/lib/semmle/javascript/PrintAst.qll
@@ -54,26 +54,26 @@ private string getQlClass(Locatable el) {
  */
 private newtype TPrintAstNode =
   // JavaScript / TypeScript
-  TElementNode(ASTNode el) { shouldPrint(el, _) and not isNotNeeded(el) } or
+  TElementNode(AstNode el) { shouldPrint(el, _) and not isNotNeeded(el) } or
   TParametersNode(Function f) { shouldPrint(f, _) and not isNotNeeded(f) } or
   TTypeParametersNode(TypeParameterized f) { shouldPrint(f, _) and not isNotNeeded(f) } or
-  TJSXAttributesNode(JSXElement n) { shouldPrint(n, _) and not isNotNeeded(n) } or
-  TJSXBodyElementsNode(JSXNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
+  TJsxAttributesNode(JsxElement n) { shouldPrint(n, _) and not isNotNeeded(n) } or
+  TJsxBodyElementsNode(JsxNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
   TInvokeArgumentsNode(InvokeExpr n) { shouldPrint(n, _) and not isNotNeeded(n) } or
   TInvokeTypeArgumentsNode(InvokeExpr invk) { shouldPrint(invk, _) and not isNotNeeded(invk) } or
   // JSON
-  TJSONNode(JSONValue value) { shouldPrint(value, _) and not isNotNeeded(value) } or
+  TJsonNode(JsonValue value) { shouldPrint(value, _) and not isNotNeeded(value) } or
   // YAML
-  TYAMLNode(YAMLNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
-  TYAMLMappingNode(YAMLMapping mapping, int i) {
+  TYamlNode(YAMLNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
+  TYamlMappingNode(YAMLMapping mapping, int i) {
     shouldPrint(mapping, _) and not isNotNeeded(mapping) and exists(mapping.getKeyNode(i))
   } or
   // HTML
-  THTMLElementNode(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
-  THTMLAttributesNodes(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
-  THTMLAttributeNode(HTML::Attribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
-  THTMLScript(Script script) { shouldPrint(script, _) and not isNotNeeded(script) } or
-  THTMLCodeInAttr(CodeInAttribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
+  THtmlElementNode(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
+  THtmlAttributesNodes(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
+  THtmlAttributeNode(HTML::Attribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
+  THtmlScript(Script script) { shouldPrint(script, _) and not isNotNeeded(script) } or
+  THtmlCodeInAttr(CodeInAttribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
   TRegExpTermNode(RegExpTerm term) {
     shouldPrint(term, _) and
     term.isUsedAsRegExp() and
@@ -168,7 +168,7 @@ private module PrintJavaScript {
    * For example by aggregating all the parameters of a function under a single child node.
    */
   class ElementNode extends PrintAstNode, TElementNode {
-    ASTNode element;
+    AstNode element;
 
     ElementNode() {
       this = TElementNode(element) and
@@ -183,10 +183,10 @@ private module PrintJavaScript {
     /**
      * Gets the `ASTNode` represented by this node.
      */
-    final ASTNode getElement() { result = element }
+    final AstNode getElement() { result = element }
 
     override PrintAstNode getChild(int childIndex) {
-      exists(ASTNode el | result.(ElementNode).getElement() = el |
+      exists(AstNode el | result.(ElementNode).getElement() = el |
         el = this.getChildNode(childIndex)
       )
     }
@@ -195,16 +195,16 @@ private module PrintJavaScript {
      * Gets the `i`th child of `element`.
      * Can be overriden in subclasses to get more specific behavior for `getChild()`.
      */
-    ASTNode getChildNode(int childIndex) { result = getLocationSortedChild(element, childIndex) }
+    AstNode getChildNode(int childIndex) { result = getLocationSortedChild(element, childIndex) }
   }
 
-  /** Provides predicates for pretty printing `ASTNode`s. */
+  /** Provides predicates for pretty printing `AstNode`s. */
   private module PrettyPrinting {
     /**
      * Gets a pretty string representation of `element`.
      * Either the result is `ASTNode::toString`, or a custom made string representation of `element`.
      */
-    string print(ASTNode element) {
+    string print(AstNode element) {
       shouldPrint(element, _) and
       (
         result = element.toString().regexpReplaceAll("(\\\\n|\\\\r|\\\\t| )+", " ") and
@@ -217,7 +217,7 @@ private module PrintJavaScript {
     /**
      * Gets a string representing `a`.
      */
-    private string repr(ASTNode a) {
+    private string repr(AstNode a) {
       shouldPrint(a, _) and
       (
         exists(DeclStmt decl | decl = a |
@@ -252,9 +252,9 @@ private module PrintJavaScript {
     }
   }
 
-  private ASTNode getLocationSortedChild(ASTNode parent, int i) {
+  private AstNode getLocationSortedChild(AstNode parent, int i) {
     result =
-      rank[i](ASTNode child, int childIndex |
+      rank[i](AstNode child, int childIndex |
         child = parent.getChild(childIndex)
       |
         child
@@ -370,62 +370,77 @@ private module PrintJavaScript {
    * 2: An aggregate node for all the attributes  (for example `href={foo}` in `<Name href={foo} />`).
    * 3: An aggregate node for all the body element (for example `foo` in `<span>foo</span>`).
    */
-  class JSXNodeNode extends ElementNode {
-    override JSXNode element;
+  class JsxNodeNode extends ElementNode {
+    override JsxNode element;
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = 0 and result.(ElementNode).getElement() = element.(JSXElement).getNameExpr()
+      childIndex = 0 and result.(ElementNode).getElement() = element.(JsxElement).getNameExpr()
       or
       childIndex = 1 and
       exists(element.getABodyElement()) and
-      result.(JSXBodyElementsNode).getJSXNode() = element
+      result.(JsxBodyElementsNode).getJsxNode() = element
       or
       childIndex = 2 and
-      exists(element.(JSXElement).getAttribute(_)) and
-      result.(JSXAttributesNode).getJSXElement() = element
+      exists(element.(JsxElement).getAttribute(_)) and
+      result.(JsxAttributesNode).getJsxElement() = element
     }
   }
 
+  /** DEPRECATED: Alias for JsxNodeNode */
+  deprecated class JSXNodeNode = JsxNodeNode;
+
   /**
    * An aggregate node representing all the attributes in a `JSXNode`.
    */
-  class JSXAttributesNode extends PrintAstNode, TJSXAttributesNode {
-    JSXElement n;
+  class JsxAttributesNode extends PrintAstNode, TJsxAttributesNode {
+    JsxElement n;
 
-    JSXAttributesNode() { this = TJSXAttributesNode(n) and exists(n.getAttribute(_)) }
+    JsxAttributesNode() { this = TJsxAttributesNode(n) and exists(n.getAttribute(_)) }
 
     override string toString() { result = "(Attributes)" }
 
     /**
      * Gets the `JSXElement` for which this node represents the attributes.
      */
-    JSXElement getJSXElement() { result = n }
+    JsxElement getJsxElement() { result = n }
+
+    /** DEPRECATED: Alias for getJsxElement */
+    deprecated JSXElement getJSXElement() { result = this.getJsxElement() }
 
     override PrintAstNode getChild(int childIndex) {
       result.(ElementNode).getElement() = n.getAttribute(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for JsxAttributesNode */
+  deprecated class JSXAttributesNode = JsxAttributesNode;
+
   /**
    * An aggregate node representing all the body elements in a `JSXNode`.
    */
-  class JSXBodyElementsNode extends PrintAstNode, TJSXBodyElementsNode {
-    JSXNode n;
+  class JsxBodyElementsNode extends PrintAstNode, TJsxBodyElementsNode {
+    JsxNode n;
 
-    JSXBodyElementsNode() { this = TJSXBodyElementsNode(n) and exists(n.getBodyElement(_)) }
+    JsxBodyElementsNode() { this = TJsxBodyElementsNode(n) and exists(n.getBodyElement(_)) }
 
     override string toString() { result = "(Body)" }
 
     /**
      * Gets the `JSXNode` for which this node represents the body elements.
      */
-    JSXNode getJSXNode() { result = n }
+    JsxNode getJsxNode() { result = n }
+
+    /** DEPRECATED: Alias for getJsxNode */
+    deprecated JSXNode getJSXNode() { result = this.getJsxNode() }
 
     override PrintAstNode getChild(int childIndex) {
       result.(ElementNode).getElement() = n.getBodyElement(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for JsxBodyElementsNode */
+  deprecated class JSXBodyElementsNode = JsxBodyElementsNode;
+
   /**
    * A node representing any `ASTNode` that has type-parameters.
    *
@@ -484,7 +499,7 @@ private module PrintJavaScript {
   class ParameterNode extends ElementNode {
     override Parameter element;
 
-    override ASTNode getChildNode(int childIndex) {
+    override AstNode getChildNode(int childIndex) {
       childIndex = 0 and result = element.getTypeAnnotation()
       or
       childIndex = 1 and result = element.getDefault()
@@ -535,14 +550,14 @@ private module PrintJavaScript {
 /**
  * Classes for printing JSON AST.
  */
-private module PrintJSON {
+private module PrintJson {
   /**
    * A print node representing a JSON value in a .json file.
    */
-  class JSONNode extends PrintAstNode, TJSONNode {
-    JSONValue value;
+  class JsonNode extends PrintAstNode, TJsonNode {
+    JsonValue value;
 
-    JSONNode() { this = TJSONNode(value) }
+    JsonNode() { this = TJsonNode(value) }
 
     override string toString() { result = getQlClass(value) + PrettyPrinting::print(value) }
 
@@ -551,22 +566,25 @@ private module PrintJSON {
     /**
      * Gets the `JSONValue` represented by this node.
      */
-    final JSONValue getValue() { result = value }
+    final JsonValue getValue() { result = value }
 
     override PrintAstNode getChild(int childIndex) {
-      exists(JSONValue child | result.(JSONNode).getValue() = child |
+      exists(JsonValue child | result.(JsonNode).getValue() = child |
         child = value.getChild(childIndex)
       )
     }
   }
 
+  /** DEPRECATED: Alias for JsonNode */
+  deprecated class JSONNode = JsonNode;
+
   /** Provied predicates for pretty printing JSON. */
   private module PrettyPrinting {
     /**
      * Gets a string representation of `n`.
      * Either using the default `JSONValue::toString`, or a custom printing of the JSON value.
      */
-    string print(JSONValue n) {
+    string print(JsonValue n) {
       shouldPrint(n, _) and
       (
         result = n.toString().regexpReplaceAll("(\\\\n|\\\\r|\\\\t| )+", " ") and
@@ -577,20 +595,20 @@ private module PrintJSON {
     }
 
     /** Gets a string representing `n`. */
-    private string repr(JSONValue n) {
+    private string repr(JsonValue n) {
       shouldPrint(n, _) and
       (
-        exists(JSONObject obj, string name, JSONValue prop | obj = n |
+        exists(JsonObject obj, string name, JsonValue prop | obj = n |
           prop = obj.getPropValue(name) and
           prop = obj.getChild(0) and
           result = "{" + name + ": ...}"
         )
         or
-        n instanceof JSONObject and not exists(n.getChild(_)) and result = "{}"
+        n instanceof JsonObject and not exists(n.getChild(_)) and result = "{}"
         or
-        result = n.(JSONPrimitiveValue).getRawValue()
+        result = n.(JsonPrimitiveValue).getRawValue()
         or
-        exists(JSONArray arr | arr = n |
+        exists(JsonArray arr | arr = n |
           result = "[]" and not exists(arr.getChild(_))
           or
           result = "[" + repr(arr.getChild(0)) + "]" and not exists(arr.getChild(1))
@@ -605,14 +623,14 @@ private module PrintJSON {
 /**
  * Classes for printing YAML AST.
  */
-module PrintYAML {
+module PrintYaml {
   /**
    * A print node representing a YAML value in a .yml file.
    */
-  class YAMLNodeNode extends PrintAstNode, TYAMLNode {
+  class YamlNodeNode extends PrintAstNode, TYamlNode {
     YAMLNode node;
 
-    YAMLNodeNode() { this = TYAMLNode(node) }
+    YamlNodeNode() { this = TYamlNode(node) }
 
     override string toString() { result = getQlClass(node) + node.toString() }
 
@@ -624,33 +642,39 @@ module PrintYAML {
     final YAMLNode getValue() { result = node }
 
     override PrintAstNode getChild(int childIndex) {
-      exists(YAMLNode child | result.(YAMLNodeNode).getValue() = child |
+      exists(YAMLNode child | result.(YamlNodeNode).getValue() = child |
         child = node.getChildNode(childIndex)
       )
     }
   }
 
+  /** DEPRECATED: Alias for YamlNodeNode */
+  deprecated class YAMLNodeNode = YamlNodeNode;
+
   /**
    * A print node representing a `YAMLMapping`.
    *
    * Each child of this node aggregates the key and value of a mapping.
    */
-  class YAMLMappingNode extends YAMLNodeNode {
+  class YamlMappingNode extends YamlNodeNode {
     override YAMLMapping node;
 
     override PrintAstNode getChild(int childIndex) {
-      exists(YAMLMappingMapNode map | map = result | map.maps(node, childIndex))
+      exists(YamlMappingMapNode map | map = result | map.maps(node, childIndex))
     }
   }
 
+  /** DEPRECATED: Alias for YamlMappingNode */
+  deprecated class YAMLMappingNode = YamlMappingNode;
+
   /**
    * A print node representing the `i`th mapping in `mapping`.
    */
-  class YAMLMappingMapNode extends PrintAstNode, TYAMLMappingNode {
+  class YamlMappingMapNode extends PrintAstNode, TYamlMappingNode {
     YAMLMapping mapping;
     int i;
 
-    YAMLMappingMapNode() { this = TYAMLMappingNode(mapping, i) }
+    YamlMappingMapNode() { this = TYamlMappingNode(mapping, i) }
 
     override string toString() {
       result = "(Mapping " + i + ")" and not exists(mapping.getKeyNode(i).(YAMLScalar).getValue())
@@ -667,24 +691,30 @@ module PrintYAML {
     }
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = 0 and result.(YAMLNodeNode).getValue() = mapping.getKeyNode(i)
+      childIndex = 0 and result.(YamlNodeNode).getValue() = mapping.getKeyNode(i)
       or
-      childIndex = 1 and result.(YAMLNodeNode).getValue() = mapping.getValueNode(i)
+      childIndex = 1 and result.(YamlNodeNode).getValue() = mapping.getValueNode(i)
     }
   }
+
+  /** DEPRECATED: Alias for YamlMappingMapNode */
+  deprecated class YAMLMappingMapNode = YamlMappingMapNode;
 }
 
+/** DEPRECATED: Alias for PrintYaml */
+deprecated module PrintYAML = PrintYaml;
+
 /**
  * Classes for printing HTML AST.
  */
-module PrintHTML {
+module PrintHtml {
   /**
    * A print node representing an HTML node in a .html file.
    */
-  class HTMLElementNode extends PrintAstNode, THTMLElementNode {
+  class HtmlElementNode extends PrintAstNode, THtmlElementNode {
     HTML::Element element;
 
-    HTMLElementNode() { this = THTMLElementNode(element) }
+    HtmlElementNode() { this = THtmlElementNode(element) }
 
     override string toString() { result = getQlClass(element) + "<" + element.getName() + " ..." }
 
@@ -696,36 +726,42 @@ module PrintHTML {
     final HTML::Element getElement() { result = element }
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = -1 and result.(HTMLAttributesNodes).getElement() = element
+      childIndex = -1 and result.(HtmlAttributesNodes).getElement() = element
       or
-      exists(HTML::Element child | result.(HTMLElementNode).getElement() = child |
+      exists(HTML::Element child | result.(HtmlElementNode).getElement() = child |
         child = element.getChild(childIndex)
       )
     }
   }
 
+  /** DEPRECATED: Alias for HtmlElementNode */
+  deprecated class HTMLElementNode = HtmlElementNode;
+
   /**
    * A print node representing an HTML node in a .html file.
    */
-  class HTMLScriptElementNode extends HTMLElementNode {
+  class HtmlScriptElementNode extends HtmlElementNode {
     override HTML::ScriptElement element;
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = -200 and result.(HTMLScript).getScript() = element.getScript()
+      childIndex = -200 and result.(HtmlScript).getScript() = element.getScript()
       or
       result = super.getChild(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for HtmlScriptElementNode */
+  deprecated class HTMLScriptElementNode = HtmlScriptElementNode;
+
   /**
    * A print node representing the code inside a `<script>` element.
    */
-  class HTMLScript extends PrintAstNode, THTMLScript {
+  class HtmlScript extends PrintAstNode, THtmlScript {
     Script script;
 
-    HTMLScript() {
-      this = THTMLScript(script) and
-      any(HTMLScriptElementNode se).getElement().(HTML::ScriptElement).getScript() = script
+    HtmlScript() {
+      this = THtmlScript(script) and
+      any(HtmlScriptElementNode se).getElement().(HTML::ScriptElement).getScript() = script
     }
 
     override string toString() { result = "(Script)" }
@@ -742,15 +778,18 @@ module PrintHTML {
     }
   }
 
+  /** DEPRECATED: Alias for HtmlScript */
+  deprecated class HTMLScript = HtmlScript;
+
   /**
    * A print node representing the code inside an attribute.
    */
-  class HTMLCodeInAttr extends PrintAstNode, THTMLCodeInAttr {
+  class HtmlCodeInAttr extends PrintAstNode, THtmlCodeInAttr {
     CodeInAttribute attr;
 
-    HTMLCodeInAttr() {
-      this = THTMLCodeInAttr(attr) and
-      any(HTMLAttributeNode an).getAttribute().getCodeInAttribute() = attr
+    HtmlCodeInAttr() {
+      this = THtmlCodeInAttr(attr) and
+      any(HtmlAttributeNode an).getAttribute().getCodeInAttribute() = attr
     }
 
     override string toString() { result = "(Script)" }
@@ -767,14 +806,17 @@ module PrintHTML {
     }
   }
 
+  /** DEPRECATED: Alias for HtmlCodeInAttr */
+  deprecated class HTMLCodeInAttr = HtmlCodeInAttr;
+
   /**
    * An aggregate node representing all the attributes of an HTMLElement.
    */
-  class HTMLAttributesNodes extends PrintAstNode, THTMLAttributesNodes {
+  class HtmlAttributesNodes extends PrintAstNode, THtmlAttributesNodes {
     HTML::Element element;
 
-    HTMLAttributesNodes() {
-      this = THTMLAttributesNodes(element) and exists(element.getAttribute(_))
+    HtmlAttributesNodes() {
+      this = THtmlAttributesNodes(element) and exists(element.getAttribute(_))
     }
 
     override string toString() { result = "(Attributes)" }
@@ -785,17 +827,20 @@ module PrintHTML {
     HTML::Element getElement() { result = element }
 
     override PrintAstNode getChild(int childIndex) {
-      result.(HTMLAttributeNode).getAttribute() = element.getAttribute(childIndex)
+      result.(HtmlAttributeNode).getAttribute() = element.getAttribute(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for HtmlAttributesNodes */
+  deprecated class HTMLAttributesNodes = HtmlAttributesNodes;
+
   /**
    * A print node representing an HTML attribute in a .html file.
    */
-  class HTMLAttributeNode extends PrintAstNode, THTMLAttributeNode {
+  class HtmlAttributeNode extends PrintAstNode, THtmlAttributeNode {
     HTML::Attribute attr;
 
-    HTMLAttributeNode() { this = THTMLAttributeNode(attr) }
+    HtmlAttributeNode() { this = THtmlAttributeNode(attr) }
 
     override string toString() { result = getQlClass(attr) + attr.toString() }
 
@@ -807,11 +852,17 @@ module PrintHTML {
     final HTML::Attribute getAttribute() { result = attr }
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = 0 and result.(HTMLCodeInAttr).getCode() = attr.getCodeInAttribute()
+      childIndex = 0 and result.(HtmlCodeInAttr).getCode() = attr.getCodeInAttribute()
     }
   }
+
+  /** DEPRECATED: Alias for HtmlAttributeNode */
+  deprecated class HTMLAttributeNode = HtmlAttributeNode;
 }
 
+/** DEPRECATED: Alias for PrintHtml */
+deprecated module PrintHTML = PrintHtml;
+
 /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
 query predicate nodes(PrintAstNode node, string key, string value) { value = node.getProperty(key) }
 
diff --git a/javascript/ql/lib/semmle/javascript/Promises.qll b/javascript/ql/lib/semmle/javascript/Promises.qll
index 6045faca417..57e07c5203e 100644
--- a/javascript/ql/lib/semmle/javascript/Promises.qll
+++ b/javascript/ql/lib/semmle/javascript/Promises.qll
@@ -434,11 +434,6 @@ module PromiseFlow {
   }
 }
 
-/**
- * DEPRECATED. Use `TaintTracking::promiseStep` instead.
- */
-deprecated predicate promiseTaintStep = TaintTracking::promiseStep/2;
-
 private class PromiseTaintStep extends TaintTracking::SharedTaintStep {
   override predicate promiseStep(DataFlow::Node pred, DataFlow::Node succ) {
     // from `x` to `new Promise((res, rej) => res(x))`
diff --git a/javascript/ql/lib/semmle/javascript/Regexp.qll b/javascript/ql/lib/semmle/javascript/Regexp.qll
index a208a98753f..fa9fe811be9 100644
--- a/javascript/ql/lib/semmle/javascript/Regexp.qll
+++ b/javascript/ql/lib/semmle/javascript/Regexp.qll
@@ -663,15 +663,6 @@ class RegExpNormalConstant extends RegExpConstant, @regexp_normal_constant {
   override string getAPrimaryQlClass() { result = "RegExpNormalConstant" }
 }
 
-/**
- * DEPRECATED. Use `RegExpNormalConstant` instead.
- *
- * This class used to represent an individual normal character but has been superseded by
- * `RegExpNormalConstant`, which represents a sequence of normal characters.
- * There is no longer a separate node for each individual character in a constant.
- */
-deprecated class RegExpNormalChar = RegExpNormalConstant;
-
 /**
  * A hexadecimal character escape in a regular expression.
  *
@@ -1306,8 +1297,8 @@ module RegExp {
   /**
    * A meta character used by HTML.
    */
-  private class HTMLMetaCharacter extends MetaCharacter {
-    HTMLMetaCharacter() { this = ["<", "'", "\""] }
+  private class HtmlMetaCharacter extends MetaCharacter {
+    HtmlMetaCharacter() { this = ["<", "'", "\""] }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/SourceMaps.qll b/javascript/ql/lib/semmle/javascript/SourceMaps.qll
index 7937799ca8f..4da9f2966ae 100644
--- a/javascript/ql/lib/semmle/javascript/SourceMaps.qll
+++ b/javascript/ql/lib/semmle/javascript/SourceMaps.qll
@@ -10,17 +10,20 @@ class SourceMappingComment extends Comment {
   string url;
 
   SourceMappingComment() {
-    exists(string sourceMappingURLRegex |
-      sourceMappingURLRegex = "[@#]\\s*sourceMappingURL\\s*=\\s*(.*)\\s*"
+    exists(string sourceMappingUrlRegex |
+      sourceMappingUrlRegex = "[@#]\\s*sourceMappingURL\\s*=\\s*(.*)\\s*"
     |
       // either a line comment whose entire text matches the regex...
-      url = this.(SlashSlashComment).getText().regexpCapture(sourceMappingURLRegex, 1)
+      url = this.(SlashSlashComment).getText().regexpCapture(sourceMappingUrlRegex, 1)
       or
       // ...or a block comment one of whose lines matches the regex
-      url = this.(SlashStarComment).getLine(_).regexpCapture("//" + sourceMappingURLRegex, 1)
+      url = this.(SlashStarComment).getLine(_).regexpCapture("//" + sourceMappingUrlRegex, 1)
     )
   }
 
   /** Gets the URL of the source map referenced by this comment. */
-  string getSourceMappingURL() { result = url }
+  string getSourceMappingUrl() { result = url }
+
+  /** DEPRECATED: Alias for getSourceMappingUrl */
+  deprecated string getSourceMappingURL() { result = getSourceMappingUrl() }
 }
diff --git a/javascript/ql/lib/semmle/javascript/Stmt.qll b/javascript/ql/lib/semmle/javascript/Stmt.qll
index 4bef2d9363f..edf8296585a 100644
--- a/javascript/ql/lib/semmle/javascript/Stmt.qll
+++ b/javascript/ql/lib/semmle/javascript/Stmt.qll
@@ -248,7 +248,7 @@ private class MaybeDirective extends ExprStmt {
  */
 class Directive extends MaybeDirective {
   Directive() {
-    exists(StmtContainer sc, ASTNode body, int i |
+    exists(StmtContainer sc, AstNode body, int i |
       // directives must be toplevel statements in their container
       body = sc.getBody() and
       this = body.getChildStmt(i) and
@@ -502,7 +502,7 @@ class JumpStmt extends TJumpStmt, Stmt {
    * Note that this predicate does not take `finally` clauses
    * into account, which may interrupt the jump.
    */
-  abstract ASTNode getTarget();
+  abstract AstNode getTarget();
 }
 
 /**
@@ -583,7 +583,7 @@ class WithStmt extends @with_stmt, ControlStmt {
     exists(Variable v | v = acc.getVariable() |
       v instanceof GlobalVariable
       or
-      exists(ASTNode scopeElt | scopeElt = v.getScope().getScopeElement() |
+      exists(AstNode scopeElt | scopeElt = v.getScope().getScopeElement() |
         scopeElt = this.getParent+()
       )
     )
@@ -676,7 +676,7 @@ class ThrowStmt extends @throw_stmt, JumpStmt {
    * `try` statement in whose body the throw statement occurs. If there is no such
    * `try` statement, the target defaults to the enclosing statement container.
    */
-  override ASTNode getTarget() {
+  override AstNode getTarget() {
     if exists(TryStmt ts | this.getParentStmt+() = ts.getBody())
     then
       this.getParentStmt+() = result.(TryStmt).getBody() and
@@ -802,7 +802,7 @@ class DoWhileStmt extends @do_while_stmt, LoopStmt {
  * var i = 1;
  * ```
  */
-class ExprOrVarDecl extends ASTNode {
+class ExprOrVarDecl extends AstNode {
   ExprOrVarDecl() {
     this instanceof Expr or
     this instanceof DeclStmt
diff --git a/javascript/ql/lib/semmle/javascript/TypeScript.qll b/javascript/ql/lib/semmle/javascript/TypeScript.qll
index b32e7b13021..70a1ed98830 100644
--- a/javascript/ql/lib/semmle/javascript/TypeScript.qll
+++ b/javascript/ql/lib/semmle/javascript/TypeScript.qll
@@ -98,7 +98,7 @@ class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespac
  * Note that imports and type parameters are not type definitions.  Consider using `TypeDecl` to capture
  * a wider class of type declarations.
  */
-class TypeDefinition extends ASTNode, @type_definition {
+class TypeDefinition extends AstNode, @type_definition {
   /**
    * Gets the identifier naming the type.
    */
@@ -376,7 +376,7 @@ class ConstructorTypeExpr extends FunctionTypeExpr, @constructor_typeexpr { }
 class PlainFunctionTypeExpr extends FunctionTypeExpr, @plain_function_typeexpr { }
 
 /** A possibly qualified identifier that declares or refers to a type. */
-abstract class TypeRef extends ASTNode { }
+abstract class TypeRef extends AstNode { }
 
 /** An identifier declaring a type name, that is, the name of a class, interface, type parameter, or import. */
 class TypeDecl extends Identifier, TypeRef, LexicalDecl {
@@ -1291,7 +1291,7 @@ class ExpressionWithTypeArguments extends @expression_with_type_arguments, Expr
 /**
  * A program element that supports type parameters, that is, a function, class, interface, type alias, mapped type, or `infer` type.
  */
-class TypeParameterized extends @type_parameterized, ASTNode {
+class TypeParameterized extends @type_parameterized, AstNode {
   /** Gets the `n`th type parameter declared on this function or type. */
   TypeParameter getTypeParameter(int n) { none() } // Overridden in subtypes.
 
@@ -1394,7 +1394,7 @@ class NonNullAssertion extends Expr, @non_null_assertion {
 /**
  * A possibly qualified identifier that refers to or declares a local name for a namespace.
  */
-abstract class NamespaceRef extends ASTNode { }
+abstract class NamespaceRef extends AstNode { }
 
 /**
  * An identifier that declares a local name for a namespace, that is,
@@ -1602,7 +1602,7 @@ class EnumDeclaration extends NamespaceDefinition, @enum_declaration, AST::Value
  * enum Color { red = 1, green, blue }
  * ```
  */
-class EnumMember extends ASTNode, @enum_member {
+class EnumMember extends AstNode, @enum_member {
   /**
    * Gets the name of the enum member, such as `off` in `enum State { on, off }`.
    *
@@ -1754,20 +1754,6 @@ class ReferenceImport extends LineComment {
    * Gets the name of the attribute, i.e. "`path`" or "`types`".
    */
   string getAttributeName() { result = attribute }
-
-  /**
-   * DEPRECATED. This is no longer supported.
-   *
-   * Gets the file referenced by this import.
-   */
-  deprecated File getImportedFile() { none() }
-
-  /**
-   * DEPRECATED. This is no longer supported.
-   *
-   * Gets the top-level of the referenced file.
-   */
-  deprecated TopLevel getImportedTopLevel() { none() }
 }
 
 /**
@@ -1853,11 +1839,6 @@ class Type extends @type {
    */
   Type getChild(int i) { type_child(result, this, i) }
 
-  /**
-   * DEPRECATED. Property lookup on types is no longer supported.
-   */
-  deprecated Type getProperty(string name) { none() }
-
   /**
    * Gets the type of the string index signature on this type,
    * such as `T` in the type `{ [s: string]: T }`.
@@ -1960,21 +1941,6 @@ class Type extends @type {
    */
   int getNumConstructorSignature() { result = count(this.getAConstructorSignature()) }
 
-  /**
-   * DEPRECATED. Method lookup on types is no longer supported.
-   */
-  deprecated FunctionCallSignatureType getMethod(string name) { none() }
-
-  /**
-   * DEPRECATED. Method lookup on types is no longer supported.
-   */
-  deprecated FunctionCallSignatureType getMethodOverload(string name, int n) { none() }
-
-  /**
-   * DEPRECATED. Method lookup on types is no longer supported.
-   */
-  deprecated FunctionCallSignatureType getAMethodOverload(string name) { none() }
-
   /**
    * Repeatedly unfolds union and intersection types and gets any of the underlying types,
    * or this type itself if it is not a union or intersection.
diff --git a/javascript/ql/lib/semmle/javascript/Variables.qll b/javascript/ql/lib/semmle/javascript/Variables.qll
index fa97bd151e6..73292cfed40 100644
--- a/javascript/ql/lib/semmle/javascript/Variables.qll
+++ b/javascript/ql/lib/semmle/javascript/Variables.qll
@@ -14,7 +14,7 @@ class Scope extends @scope {
   Scope getAnInnerScope() { result.getOuterScope() = this }
 
   /** Gets the program element this scope is associated with, if any. */
-  ASTNode getScopeElement() { scopenodes(result, this) }
+  AstNode getScopeElement() { scopenodes(result, this) }
 
   /** Gets the location of the program element this scope is associated with, if any. */
   Location getLocation() { result = this.getScopeElement().getLocation() }
@@ -32,7 +32,7 @@ class Scope extends @scope {
 /**
  * A program element that induces a scope.
  */
-class ScopeElement extends ASTNode {
+class ScopeElement extends AstNode {
   Scope s;
 
   ScopeElement() { this = s.getScopeElement() }
@@ -581,7 +581,7 @@ class ObjectPattern extends DestructuringPattern, @object_pattern {
  * }
  * ```
  */
-class PropertyPattern extends @property, ASTNode {
+class PropertyPattern extends @property, AstNode {
   PropertyPattern() {
     // filter out ordinary properties
     exists(ObjectPattern obj | properties(this, obj, _, _, _))
diff --git a/javascript/ql/lib/semmle/javascript/XML.qll b/javascript/ql/lib/semmle/javascript/XML.qll
index dc76884b73c..fb781a4683f 100755
--- a/javascript/ql/lib/semmle/javascript/XML.qll
+++ b/javascript/ql/lib/semmle/javascript/XML.qll
@@ -4,21 +4,14 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
-  /**
-   * DEPRECATED: Use `getLocation()` instead.
-   *
-   * Gets the source location for this element.
-   */
-  deprecated Location getALocation() { result = this.getLocation() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -83,21 +76,6 @@ class XMLParent extends @xmlparent {
   /** Gets the number of places in the body of this XML parent where text occurs. */
   int getNumberOfCharacterSets() { result = count(int pos | xmlChars(_, _, this, pos, _, _)) }
 
-  /**
-   * DEPRECATED: Internal.
-   *
-   * Append the character sequences of this XML parent from left to right, separated by a space,
-   * up to a specified (zero-based) index.
-   */
-  deprecated string charsSetUpTo(int n) {
-    n = 0 and xmlChars(_, result, this, 0, _, _)
-    or
-    n > 0 and
-    exists(string chars | xmlChars(_, chars, this, n, _, _) |
-      result = this.charsSetUpTo(n - 1) + " " + chars
-    )
-  }
-
   /**
    * Gets the result of appending all the character sequences of this XML parent from
    * left to right, separated by a space.
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll b/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
index 237667746d6..5a9b3de4a9b 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
@@ -166,20 +166,6 @@ abstract class Configuration extends string {
     )
   }
 
-  /**
-   * DEPRECATED: Use `isBarrierEdge` instead.
-   *
-   * Holds if flow from `src` to `trg` is prohibited.
-   */
-  deprecated predicate isBarrier(DataFlow::Node src, DataFlow::Node trg) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrierEdge` instead.
-   *
-   * Holds if flow with label `lbl` cannot flow from `src` to `trg`.
-   */
-  deprecated predicate isBarrier(DataFlow::Node src, DataFlow::Node trg, FlowLabel lbl) { none() }
-
   /**
    * Holds if flow from `pred` to `succ` is prohibited.
    */
@@ -535,13 +521,6 @@ private predicate isLabeledBarrierEdge(
  */
 abstract class LabeledBarrierGuardNode extends BarrierGuardNode {
   override predicate blocks(boolean outcome, Expr e) { none() }
-
-  /**
-   * DEPRECATED: Use `blocks(outcome, e, label)` or `sanitizes(outcome, e, label)` instead.
-   *
-   * Overriding this predicate has no effect.
-   */
-  deprecated FlowLabel getALabel() { none() }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
index 0b0b0a61cdb..247c9dfd319 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -78,7 +78,7 @@ module DataFlow {
     }
 
     /** Gets the AST node corresponding to this data flow node, if any. */
-    ASTNode getAstNode() { none() }
+    AstNode getAstNode() { none() }
 
     /** Gets the basic block to which this node belongs. */
     BasicBlock getBasicBlock() { none() }
@@ -332,7 +332,7 @@ module DataFlow {
 
     override File getFile() { result = ssa.getBasicBlock().getFile() }
 
-    override ASTNode getAstNode() { none() }
+    override AstNode getAstNode() { none() }
   }
 
   /**
@@ -353,11 +353,11 @@ module DataFlow {
           .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() { result = prop.(ASTNode).toString() }
+    override string toString() { result = prop.(AstNode).toString() }
 
-    override File getFile() { result = prop.(ASTNode).getFile() }
+    override File getFile() { result = prop.(AstNode).getFile() }
 
-    override ASTNode getAstNode() { result = prop }
+    override AstNode getAstNode() { result = prop }
   }
 
   /**
@@ -382,7 +382,7 @@ module DataFlow {
 
     override File getFile() { result = pattern.getFile() }
 
-    override ASTNode getAstNode() { result = rest }
+    override AstNode getAstNode() { result = rest }
   }
 
   /**
@@ -407,7 +407,7 @@ module DataFlow {
 
     override File getFile() { result = pattern.getFile() }
 
-    override ASTNode getAstNode() { result = elt }
+    override AstNode getAstNode() { result = elt }
   }
 
   /**
@@ -436,7 +436,7 @@ module DataFlow {
 
     override File getFile() { result = arr.getFile() }
 
-    override ASTNode getAstNode() { result = elt }
+    override AstNode getAstNode() { result = elt }
   }
 
   /**
@@ -445,9 +445,8 @@ module DataFlow {
    */
   private class ReflectiveCallNode extends Node, TReflectiveCallNode {
     MethodCallExpr call;
-    string kind;
 
-    ReflectiveCallNode() { this = TReflectiveCallNode(call, kind) }
+    ReflectiveCallNode() { this = TReflectiveCallNode(call, _) }
 
     override BasicBlock getBasicBlock() { result = call.getBasicBlock() }
 
@@ -720,7 +719,7 @@ module DataFlow {
    * the JSX element it is in.
    */
   private class JsxAttributeAsPropWrite extends PropWrite, PropNode {
-    override JSXAttribute prop;
+    override JsxAttribute prop;
 
     override Node getBase() { result = valueNode(prop.getElement()) }
 
@@ -1308,7 +1307,7 @@ module DataFlow {
    * This predicate is only defined for expressions, properties, and for statements that declare
    * a function, a class, or a TypeScript namespace or enum.
    */
-  ValueNode valueNode(ASTNode nd) { result.getAstNode() = nd }
+  ValueNode valueNode(AstNode nd) { result.getAstNode() = nd }
 
   /**
    * Gets the data flow node corresponding to `e`.
@@ -1670,11 +1669,11 @@ module DataFlow {
     or
     exists(Expr e | e = nd.asExpr() and cause = "heap" |
       e instanceof PropAccess or
-      e instanceof E4X::XMLAnyName or
-      e instanceof E4X::XMLAttributeSelector or
-      e instanceof E4X::XMLDotDotExpression or
-      e instanceof E4X::XMLFilterExpression or
-      e instanceof E4X::XMLQualifiedIdentifier or
+      e instanceof E4X::XmlAnyName or
+      e instanceof E4X::XmlAttributeSelector or
+      e instanceof E4X::XmlDotDotExpression or
+      e instanceof E4X::XmlFilterExpression or
+      e instanceof E4X::XmlQualifiedIdentifier or
       e instanceof Angular2::PipeRefExpr
     )
     or
@@ -1716,9 +1715,8 @@ module DataFlow {
   import Sources
   import TypeInference
   import Configuration
-  import TrackedNodes
   import TypeTracking
   import internal.FunctionWrapperSteps
 
-  predicate localTaintStep = TaintTracking::localTaintStep/2;
+  deprecated predicate localTaintStep = TaintTracking::localTaintStep/2;
 }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll b/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
index a28194dc016..c0a47d39d83 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
@@ -1403,13 +1403,6 @@ module PartialInvokeNode {
      */
     DataFlow::SourceNode getBoundFunction(DataFlow::Node callback, int boundArgs) { none() }
 
-    /**
-     * DEPRECATED. Use the one-argument version of `getBoundReceiver` instead.
-     *
-     * Gets the node holding the receiver to be passed to the bound function, if specified.
-     */
-    deprecated DataFlow::Node getBoundReceiver() { none() }
-
     /**
      * Gets the node holding the receiver to be passed to `callback`.
      */
@@ -1541,16 +1534,6 @@ module PartialInvokeNode {
   }
 }
 
-/**
- * DEPRECATED. Subclasses should extend `PartialInvokeNode::Range` instead,
- * and predicates should use `PartialInvokeNode` instead.
- *
- * An invocation that is modeled as a partial function application.
- *
- * This contributes additional argument-passing flow edges that should be added to all data flow configurations.
- */
-deprecated class AdditionalPartialInvokeNode = PartialInvokeNode::Range;
-
 /**
  * An invocation of the `RegExp` constructor.
  *
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll b/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
index 697e2dd3903..299819de4cd 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
@@ -180,7 +180,7 @@ private class NpmPackagePortal extends Portal, MkNpmPackagePortal {
 private module NpmPackagePortal {
   /** Gets an import of `imported` inside package `importer`. */
   pragma[noinline]
-  private DataFlow::SourceNode getAModuleImport(NPMPackage importer, string imported) {
+  private DataFlow::SourceNode getAModuleImport(NpmPackage importer, string imported) {
     result = DataFlow::moduleImport(imported) and
     result.getTopLevel() = importer.getAModule()
   }
@@ -188,7 +188,7 @@ private module NpmPackagePortal {
   /** Gets an import of `member` from `imported` inside package `importer`. */
   pragma[noinline]
   private DataFlow::SourceNode getAModuleMemberImport(
-    NPMPackage importer, string imported, string member
+    NpmPackage importer, string imported, string member
   ) {
     result = DataFlow::moduleMember(imported, member) and
     result.getTopLevel() = importer.getAModule()
@@ -196,7 +196,7 @@ private module NpmPackagePortal {
 
   /** Holds if `imp` is an import of package `pkgName`. */
   predicate imports(DataFlow::SourceNode imp, string pkgName) {
-    exists(NPMPackage pkg |
+    exists(NpmPackage pkg |
       imp = getAModuleImport(pkg, pkgName) and
       pkgName.regexpMatch("[^./].*")
     )
@@ -204,7 +204,7 @@ private module NpmPackagePortal {
 
   /** Holds if `imp` imports `member` from package `pkgName`. */
   predicate imports(DataFlow::SourceNode imp, string pkgName, string member) {
-    exists(NPMPackage pkg |
+    exists(NpmPackage pkg |
       imp = getAModuleMemberImport(pkg, pkgName, member) and
       pkgName.regexpMatch("[^./].*")
     )
@@ -212,7 +212,7 @@ private module NpmPackagePortal {
 
   /** Gets the main module of package `pkgName`. */
   Module packageMain(string pkgName) {
-    exists(PackageJSON pkg |
+    exists(PackageJson pkg |
       // don't construct portals for private packages
       not pkg.isPrivate() and
       // don't construct portals for vendored-in packages
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
index 6c6b42943ac..73d3f9c96ac 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
@@ -146,7 +146,8 @@ class SourceNode extends DataFlow::Node {
    * that is, `o.m(...)` or `o[p](...)`.
    */
   DataFlow::CallNode getAChainedMethodCall(string methodName) {
-    result = getAMethodCall*().getAMethodCall(methodName)
+    // the direct call to `getAMethodCall` is needed in case the base is not a `DataFlow::CallNode`.
+    result = [getAMethodCall+().getAMethodCall(methodName), getAMethodCall(methodName)]
   }
 
   /**
@@ -301,13 +302,13 @@ module SourceNode {
    */
   class DefaultRange extends Range {
     DefaultRange() {
-      exists(ASTNode astNode | this = DataFlow::valueNode(astNode) |
+      exists(AstNode astNode | this = DataFlow::valueNode(astNode) |
         astNode instanceof PropAccess or
         astNode instanceof Function or
         astNode instanceof ClassDefinition or
         astNode instanceof ObjectExpr or
         astNode instanceof ArrayExpr or
-        astNode instanceof JSXNode or
+        astNode instanceof JsxNode or
         astNode instanceof GlobalVarAccess or
         astNode instanceof ExternalModuleReference or
         astNode instanceof RegExpLiteral or
@@ -395,7 +396,3 @@ SourceNode moduleVarNode(Module m) { result.(ModuleVarNode).getModule() = m }
 
 /** Gets the CommonJS/AMD `exports` variable for module `m`. */
 SourceNode exportsVarNode(Module m) { result.(ExportsVarNode).getModule() = m }
-
-deprecated class DefaultSourceNode extends SourceNode {
-  DefaultSourceNode() { this instanceof SourceNode::DefaultRange }
-}
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
index 5ed5cab0cff..184e8a255a7 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
@@ -62,24 +62,6 @@ module TaintTracking {
      */
     predicate isSanitizer(DataFlow::Node node) { none() }
 
-    /**
-     * DEPRECATED: Use `isSanitizerEdge` instead.
-     *
-     * Holds if the edge from `source` to `sink` is a taint sanitizer.
-     */
-    deprecated predicate isSanitizer(DataFlow::Node source, DataFlow::Node sink) { none() }
-
-    /**
-     * DEPRECATED: Use `isSanitizerEdge` instead.
-     *
-     * Holds if the edge from `source` to `sink` is a taint sanitizer for data labelled with `lbl`.
-     */
-    deprecated predicate isSanitizer(
-      DataFlow::Node source, DataFlow::Node sink, DataFlow::FlowLabel lbl
-    ) {
-      none()
-    }
-
     /** Holds if the edge from `pred` to `succ` is a taint sanitizer. */
     predicate isSanitizerEdge(DataFlow::Node pred, DataFlow::Node succ) { none() }
 
@@ -447,9 +429,10 @@ module TaintTracking {
 
   /**
    * Holds if `pred -> succ` is a taint propagating data flow edge through a string operation.
+   * DEPRECATED: Use `stringConcatenationStep` and `stringManipulationStep` instead.
    */
   pragma[inline]
-  predicate stringStep(DataFlow::Node pred, DataFlow::Node succ) {
+  deprecated predicate stringStep(DataFlow::Node pred, DataFlow::Node succ) {
     stringConcatenationStep(pred, succ) or
     stringManipulationStep(pred, succ)
   }
@@ -551,7 +534,10 @@ module TaintTracking {
       or
       // reading from a tainted object yields a tainted result
       succ.(DataFlow::PropRead).getBase() = pred and
-      not AccessPath::DominatingPaths::hasDominatingWrite(succ) and
+      not (
+        AccessPath::DominatingPaths::hasDominatingWrite(succ) and
+        exists(succ.(DataFlow::PropRead).getPropertyName())
+      ) and
       not isSafeClientSideUrlProperty(succ) and
       not ClassValidator::isAccessToSanitizedField(succ)
       or
@@ -570,11 +556,10 @@ module TaintTracking {
   }
 
   /**
-   * DEPRECATED. Use the predicate `TaintTracking::persistentStorageStep` instead.
-   *
    * A taint propagating data flow edge through persistent storage.
+   * Use `TaintTracking::persistentStorageStep` instead of accessing this class.
    */
-  deprecated class PersistentStorageTaintStep extends SharedTaintStep {
+  private class PersistentStorageTaintStep extends SharedTaintStep {
     override predicate persistentStorageStep(DataFlow::Node pred, DataFlow::Node succ) {
       exists(PersistentReadAccess read |
         pred = read.getAWrite().getValue() and
@@ -583,8 +568,6 @@ module TaintTracking {
     }
   }
 
-  deprecated predicate arrayFunctionTaintStep = ArrayTaintTracking::arrayFunctionTaintStep/3;
-
   /**
    * A taint propagating data flow edge for assignments of the form `o[k] = v`, where
    * one of the following holds:
@@ -1175,9 +1158,6 @@ module TaintTracking {
     polarity = guard.asExpr().(EqualityTest).getPolarity()
   }
 
-  /** DEPRECATED. This class has been renamed to `MembershipTestSanitizer`. */
-  deprecated class StringInclusionSanitizer = MembershipTestSanitizer;
-
   /**
    * A test of form `x.length === "0"`, preventing `x` from being tainted.
    */
@@ -1200,9 +1180,6 @@ module TaintTracking {
     override predicate appliesTo(Configuration cfg) { any() }
   }
 
-  /** DEPRECATED. This class has been renamed to `MembershipTestSanitizer`. */
-  deprecated class InclusionSanitizer = MembershipTestSanitizer;
-
   /**
    * A check of the form `whitelist.includes(x)` or equivalent, which sanitizes `x` in its "then" branch.
    */
@@ -1244,38 +1221,6 @@ module TaintTracking {
     override predicate appliesTo(Configuration cfg) { any() }
   }
 
-  /** Gets a variable that is defined exactly once. */
-  private Variable singleDef() { strictcount(result.getADefinition()) = 1 }
-
-  /**
-   * A check of the form `if(x == 'some-constant')`, which sanitizes `x` in its "then" branch.
-   *
-   * DEPRECATED: use `MembershipTestSanitizer` instead.
-   */
-  deprecated class ConstantComparison extends SanitizerGuardNode, DataFlow::ValueNode {
-    Expr x;
-    override EqualityTest astNode;
-
-    ConstantComparison() {
-      exists(Expr const | astNode.hasOperands(x, const) |
-        // either the other operand is a constant
-        const instanceof ConstantExpr
-        or
-        // or it's an access to a variable that probably acts as a symbolic constant
-        const = singleDef().getAnAccess()
-      )
-    }
-
-    override predicate sanitizes(boolean outcome, Expr e) {
-      outcome = astNode.getPolarity() and x = e
-    }
-
-    /**
-     * Holds if this guard applies to the flow in `cfg`.
-     */
-    predicate appliesTo(Configuration cfg) { any() }
-  }
-
   /**
    * An equality test on `e.origin` or `e.source` where `e` is a `postMessage` event object,
    * considered as a sanitizer for `e`.
@@ -1301,8 +1246,9 @@ module TaintTracking {
 
   /**
    * Holds if taint propagates from `pred` to `succ` in one local (intra-procedural) step.
+   * DEPRECATED: Use `TaintTracking::sharedTaintStep` and `DataFlow::Node::getALocalSource()` instead.
    */
-  predicate localTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
+  deprecated predicate localTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
     DataFlow::localFlowStep(pred, succ) or
     sharedTaintStep(pred, succ)
   }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TrackedNodes.qll b/javascript/ql/lib/semmle/javascript/dataflow/TrackedNodes.qll
deleted file mode 100644
index 58ecb5ae54b..00000000000
--- a/javascript/ql/lib/semmle/javascript/dataflow/TrackedNodes.qll
+++ /dev/null
@@ -1,425 +0,0 @@
-/**
- * DEPRECATED: Use `TypeTracking.qll` instead.
- *
- * The following `TrackedNode` usage is usually equivalent to the type tracking usage below.
- *
- * ```
- * class MyTrackedNode extends TrackedNode {
- *    MyTrackedNode() { isInteresting(this) }
- * }
- *
- * DataFlow::Node getMyTrackedNodeLocation(MyTrackedNode n) {
- *   n.flowsTo(result)
- * }
- * ```
- *
- * ```
- * DataFlow::SourceNode getMyTrackedNodeLocation(DataFlow::SourceNode start, DataFlow::TypeTracker t) {
- *   t.start() and
- *   isInteresting(result) and
- *   result = start
- *   or
- *   exists (DataFlow::TypeTracker t2 |
- *     result = getMyTrackedNodeLocation(start, t2).track(t2, t)
- *   )
- * }
- *
- * DataFlow::SourceNode getMyTrackedNodeLocation(DataFlow::SourceNode n) {
- *   result = getMyTrackedNodeLocation(n, DataFlow::TypeTracker::end())
- * }
- * ```
- *
- * In rare cases, additional tracking is required, for instance when tracking string constants, and the following type tracking formulation is required instead.
- *
- * ```
- * DataFlow::Node getMyTrackedNodeLocation(DataFlow::Node start, DataFlow::TypeTracker t) {
- *   t.start() and
- *   isInteresting(result) and
- *   result = start
- *   or
- *   exists(DataFlow::TypeTracker t2 |
- *     t = t2.smallstep(getMyTrackedNodeLocation(start, t2), result)
- *   )
- * }
- *
- * DataFlow::Node getMyTrackedNodeLocation(DataFlow::Node n) {
- *   result = getMyTrackedNodeLocation(n, DataFlow::TypeTracker::end())
- * }
- * ```
- *
- * Provides support for inter-procedural tracking of a customizable
- * set of data flow nodes.
- */
-
-private import javascript
-private import internal.FlowSteps as FlowSteps
-
-/**
- * A data flow node that should be tracked inter-procedurally.
- *
- * To track additional values, extends this class with additional
- * subclasses.
- */
-abstract deprecated class TrackedNode extends DataFlow::Node {
-  /**
-   * Holds if this node flows into `sink` in zero or more (possibly
-   * inter-procedural) steps.
-   */
-  predicate flowsTo(DataFlow::Node sink) { NodeTracking::flowsTo(this, sink, _) }
-}
-
-/**
- * An expression whose value should be tracked inter-procedurally.
- *
- * To track additional expressions, extends this class with additional
- * subclasses.
- */
-abstract deprecated class TrackedExpr extends Expr {
-  predicate flowsTo(Expr sink) {
-    exists(TrackedExprNode ten | ten.asExpr() = this | ten.flowsTo(DataFlow::valueNode(sink)))
-  }
-}
-
-/**
- * Turn all `TrackedExpr`s into `TrackedNode`s.
- */
-deprecated private class TrackedExprNode extends TrackedNode {
-  TrackedExprNode() { asExpr() instanceof TrackedExpr }
-}
-
-/**
- * A simplified copy of `Configuration.qll` that implements tracking
- * of `TrackedNode`s without barriers or additional flow steps.
- */
-private module NodeTracking {
-  private import internal.FlowSteps
-
-  /**
-   * Holds if data can flow in one step from `pred` to `succ`,  taking
-   * additional steps into account.
-   */
-  pragma[inline]
-  predicate localFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-    pred = succ.getAPredecessor()
-    or
-    DataFlow::SharedFlowStep::step(pred, succ)
-    or
-    localExceptionStep(pred, succ)
-  }
-
-  /**
-   * Holds if there is a flow step from `pred` to `succ` described by `summary`.
-   *
-   * Summary steps through function calls are not taken into account.
-   */
-  deprecated private predicate basicFlowStep(
-    DataFlow::Node pred, DataFlow::Node succ, PathSummary summary
-  ) {
-    isRelevant(pred) and
-    (
-      // Local flow
-      localFlowStep(pred, succ) and
-      summary = PathSummary::level()
-      or
-      // Flow through properties of objects
-      propertyFlowStep(pred, succ) and
-      summary = PathSummary::level()
-      or
-      // Flow through global variables
-      globalFlowStep(pred, succ) and
-      summary = PathSummary::level()
-      or
-      // Flow into function
-      callStep(pred, succ) and
-      summary = PathSummary::call()
-      or
-      // Flow out of function
-      returnStep(pred, succ) and
-      summary = PathSummary::return()
-    )
-  }
-
-  /**
-   * Holds if `nd` may be reachable from a tracked node.
-   *
-   * No call/return matching is done, so this is a relatively coarse over-approximation.
-   */
-  deprecated private predicate isRelevant(DataFlow::Node nd) {
-    nd instanceof TrackedNode
-    or
-    exists(DataFlow::Node mid | isRelevant(mid) |
-      basicFlowStep(mid, nd, _)
-      or
-      basicStoreStep(mid, nd, _)
-      or
-      basicLoadStep(mid, nd, _)
-      or
-      exploratoryCallbackStep(mid, nd)
-      or
-      nd = mid.(DataFlow::FunctionNode).getAParameter()
-    )
-  }
-
-  /**
-   * Holds if `pred` is an input to `f` which is passed to `succ` at `invk`; that is,
-   * either `pred` is an argument of `f` and `succ` the corresponding parameter, or
-   * `pred` is a variable definition whose value is captured by `f` at `succ`.
-   */
-  deprecated private predicate callInputStep(
-    Function f, DataFlow::Node invk, DataFlow::Node pred, DataFlow::Node succ
-  ) {
-    isRelevant(pred) and
-    (
-      argumentPassing(invk, pred, f, succ)
-      or
-      exists(LocalVariable variable, SsaDefinition def |
-        pred = DataFlow::capturedVariableNode(variable) and
-        calls(invk, f) and
-        captures(f, variable, def) and
-        succ = DataFlow::ssaDefinitionNode(def)
-      )
-    )
-  }
-
-  /**
-   * Holds if `input`, which is either an argument to `f` at `invk` or a definition
-   * that is captured by `f`, may flow to `nd` (possibly through callees, but not containing
-   * any unmatched calls or returns) along a path summarized by `summary`.
-   */
-  deprecated private predicate reachableFromInput(
-    Function f, DataFlow::Node invk, DataFlow::Node input, DataFlow::Node nd, PathSummary summary
-  ) {
-    callInputStep(f, invk, input, nd) and
-    summary = PathSummary::level()
-    or
-    exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
-      reachableFromInput(f, invk, input, mid, oldSummary) and
-      flowStep(mid, nd, newSummary) and
-      newSummary.isLevel() and
-      summary = oldSummary.append(newSummary)
-    )
-  }
-
-  /**
-   * Holds if `nd` may flow into a return statement of `f`
-   * (possibly through callees) along a path summarized by `summary`.
-   */
-  deprecated private predicate reachesReturn(Function f, DataFlow::Node nd, PathSummary summary) {
-    returnExpr(f, nd, _) and
-    summary = PathSummary::level()
-    or
-    exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
-      flowStep(nd, mid, oldSummary) and
-      reachesReturn(f, mid, newSummary) and
-      summary = oldSummary.append(newSummary)
-    )
-  }
-
-  /**
-   * Holds if a function invoked at `invk` may return an expression into which `input`,
-   * which is either an argument or a definition captured by the function, flows,
-   * possibly through callees.
-   */
-  deprecated private predicate flowThroughCall(DataFlow::Node input, DataFlow::Node output) {
-    exists(Function f, DataFlow::ValueNode ret |
-      ret.asExpr() = f.getAReturnedExpr() and
-      reachableFromInput(f, output, input, ret, _)
-    )
-    or
-    exists(Function f, DataFlow::Node invk, DataFlow::Node ret |
-      DataFlow::exceptionalFunctionReturnNode(ret, f) and
-      DataFlow::exceptionalInvocationReturnNode(output, invk.asExpr()) and
-      calls(invk, f) and
-      reachableFromInput(f, invk, input, ret, _)
-    )
-  }
-
-  /**
-   * Holds if `pred` may flow into property `prop` of `succ` along a path summarized by `summary`.
-   */
-  deprecated private predicate storeStep(
-    DataFlow::Node pred, DataFlow::SourceNode succ, string prop, PathSummary summary
-  ) {
-    basicStoreStep(pred, succ, prop) and
-    summary = PathSummary::level()
-    or
-    exists(Function f, DataFlow::Node mid | not f.isAsyncOrGenerator() |
-      // `f` stores its parameter `pred` in property `prop` of a value that flows back to the caller,
-      // and `succ` is an invocation of `f`
-      reachableFromInput(f, succ, pred, mid, summary) and
-      (
-        returnedPropWrite(f, _, prop, mid)
-        or
-        succ instanceof DataFlow::NewNode and
-        receiverPropWrite(f, prop, mid)
-      )
-    )
-  }
-
-  /**
-   * Holds if property `prop` of `pred` may flow into `succ` along a path summarized by
-   * `summary`.
-   */
-  deprecated private predicate loadStep(
-    DataFlow::Node pred, DataFlow::Node succ, string prop, PathSummary summary
-  ) {
-    basicLoadStep(pred, succ, prop) and
-    summary = PathSummary::level()
-    or
-    exists(Function f, DataFlow::SourceNode parm | not f.isAsyncOrGenerator() |
-      argumentPassing(succ, pred, f, parm) and
-      reachesReturn(f, parm.getAPropertyRead(prop), summary)
-    )
-  }
-
-  /**
-   * Holds if `rhs` is the right-hand side of a write to property `prop`, and `nd` is reachable
-   * from the base of that write (possibly through callees) along a path summarized by `summary`.
-   */
-  deprecated private predicate reachableFromStoreBase(
-    string prop, DataFlow::Node rhs, DataFlow::Node nd, PathSummary summary
-  ) {
-    storeStep(rhs, nd, prop, summary)
-    or
-    exists(DataFlow::Node mid, PathSummary oldSummary, PathSummary newSummary |
-      reachableFromStoreBase(prop, rhs, mid, oldSummary) and
-      flowStep(mid, nd, newSummary) and
-      summary = oldSummary.append(newSummary)
-    )
-  }
-
-  /**
-   * Holds if the value of `pred` is written to a property of some base object, and that base
-   * object may flow into the base of property read `succ` along a path summarized by `summary`.
-   *
-   * In other words, `pred` may flow to `succ` through a property.
-   */
-  deprecated private predicate flowThroughProperty(
-    DataFlow::Node pred, DataFlow::Node succ, PathSummary summary
-  ) {
-    exists(string prop, DataFlow::Node base, PathSummary oldSummary, PathSummary newSummary |
-      reachableFromStoreBase(prop, pred, base, oldSummary) and
-      loadStep(base, succ, prop, newSummary) and
-      summary = oldSummary.append(newSummary)
-    )
-  }
-
-  /**
-   * Holds if `arg` and `cb` are passed as arguments to a function which in turn
-   * invokes `cb`, passing `arg` as its `i`th argument. `arg` flows along a path summarized
-   * by `summary`, while `cb` is only tracked locally.
-   */
-  deprecated private predicate summarizedHigherOrderCall(
-    DataFlow::Node arg, DataFlow::Node cb, int i, PathSummary summary
-  ) {
-    exists(
-      Function f, DataFlow::InvokeNode outer, DataFlow::InvokeNode inner, int j,
-      DataFlow::Node innerArg, DataFlow::SourceNode cbParm, PathSummary oldSummary
-    |
-      reachableFromInput(f, outer, arg, innerArg, oldSummary) and
-      argumentPassing(outer, cb, f, cbParm) and
-      innerArg = inner.getArgument(j)
-    |
-      // direct higher-order call
-      cbParm.flowsTo(inner.getCalleeNode()) and
-      i = j and
-      summary = oldSummary
-      or
-      // indirect higher-order call
-      exists(DataFlow::Node cbArg, PathSummary newSummary |
-        cbParm.flowsTo(cbArg) and
-        summarizedHigherOrderCall(innerArg, cbArg, i, newSummary) and
-        summary = oldSummary.append(PathSummary::call()).append(newSummary)
-      )
-    )
-  }
-
-  /**
-   * Holds if `arg` is passed as the `i`th argument to `callback` through a callback invocation.
-   *
-   * This can be a summarized call, that is, `arg` and `callback` flow into a call,
-   * `f(arg, callback)`, which  performs the invocation.
-   *
-   * Alternatively, the callback can flow into a call `f(callback)` which itself provides the `arg`.
-   * That is, `arg` refers to a value defined in `f` or one of its callees.
-   */
-  deprecated predicate higherOrderCall(
-    DataFlow::Node arg, DataFlow::SourceNode callback, int i, PathSummary summary
-  ) {
-    // Summarized call
-    exists(DataFlow::Node cb |
-      summarizedHigherOrderCall(arg, cb, i, summary) and
-      callback.flowsTo(cb)
-    )
-    or
-    // Local invocation of a parameter
-    isRelevant(arg) and
-    exists(DataFlow::InvokeNode invoke |
-      arg = invoke.getArgument(i) and
-      invoke = callback.(DataFlow::ParameterNode).getACall() and
-      summary = PathSummary::call()
-    )
-    or
-    // Forwarding of the callback parameter  (but not the argument).
-    // We use a return summary since flow moves back towards the call site.
-    // This ensures that an argument that is only tainted in some contexts cannot flow
-    // out to every callback.
-    exists(DataFlow::Node cbArg, DataFlow::SourceNode innerCb, PathSummary oldSummary |
-      higherOrderCall(arg, innerCb, i, oldSummary) and
-      callStep(cbArg, innerCb) and
-      callback.flowsTo(cbArg) and
-      summary = PathSummary::return().append(oldSummary)
-    )
-  }
-
-  /**
-   * Holds if `pred` is passed as an argument to a function `f` which also takes a
-   * callback parameter `cb` and then invokes `cb`, passing `pred` into parameter `succ`
-   * of `cb`. `arg` flows along a path summarized by `summary`, while `cb` is only tracked
-   * locally.
-   */
-  deprecated private predicate flowIntoHigherOrderCall(
-    DataFlow::Node pred, DataFlow::Node succ, PathSummary summary
-  ) {
-    exists(DataFlow::FunctionNode cb, int i, PathSummary oldSummary |
-      higherOrderCall(pred, cb, i, oldSummary) and
-      succ = cb.getParameter(i) and
-      summary = oldSummary.append(PathSummary::call())
-    )
-  }
-
-  /**
-   * Holds if there is a flow step from `pred` to `succ` described by `summary`.
-   */
-  deprecated private predicate flowStep(
-    DataFlow::Node pred, DataFlow::Node succ, PathSummary summary
-  ) {
-    basicFlowStep(pred, succ, summary)
-    or
-    // Flow through a function that returns a value that depends on one of its arguments
-    // or a captured variable
-    flowThroughCall(pred, succ) and
-    summary = PathSummary::level()
-    or
-    // Flow through a property write/read pair
-    flowThroughProperty(pred, succ, summary)
-    or
-    // Flow into higher-order call
-    flowIntoHigherOrderCall(pred, succ, summary)
-  }
-
-  /**
-   * Holds if there is a path from `source` to `nd` along a path summarized by
-   * `summary`.
-   */
-  deprecated predicate flowsTo(TrackedNode source, DataFlow::Node nd, PathSummary summary) {
-    source = nd and
-    summary = PathSummary::level()
-    or
-    exists(DataFlow::Node pred, PathSummary oldSummary, PathSummary newSummary |
-      flowsTo(source, pred, oldSummary) and
-      flowStep(pred, nd, newSummary) and
-      summary = oldSummary.append(newSummary)
-    )
-  }
-}
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
index 786dcd08496..d0b8242f143 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
@@ -129,8 +129,8 @@ private class AnalyzedEnumDeclaration extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for JSX elements and fragments.
  */
-private class AnalyzedJSXNode extends DataFlow::AnalyzedValueNode {
-  override JSXNode astNode;
+private class AnalyzedJsxNode extends DataFlow::AnalyzedValueNode {
+  override JsxNode astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractOtherObject() }
 }
@@ -138,8 +138,8 @@ private class AnalyzedJSXNode extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for qualified JSX names.
  */
-private class AnalyzedJSXQualifiedName extends DataFlow::AnalyzedValueNode {
-  override JSXQualifiedName astNode;
+private class AnalyzedJsxQualifiedName extends DataFlow::AnalyzedValueNode {
+  override JsxQualifiedName astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractOtherObject() }
 }
@@ -147,8 +147,8 @@ private class AnalyzedJSXQualifiedName extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for empty JSX expressions.
  */
-private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode {
-  override JSXEmptyExpr astNode;
+private class AnalyzedJsxEmptyExpression extends DataFlow::AnalyzedValueNode {
+  override JsxEmptyExpr astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractUndefined() }
 }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
index 0704955bfb5..eff90532490 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
@@ -380,9 +380,10 @@ private class AnalyzedExportAssign extends AnalyzedPropertyWrite, DataFlow::Valu
  */
 private class AnalyzedClosureExportAssign extends AnalyzedPropertyWrite, DataFlow::ValueNode {
   override AssignExpr astNode;
-  Closure::ClosureModule mod;
 
-  AnalyzedClosureExportAssign() { astNode.getLhs() = mod.getExportsVariable().getAReference() }
+  AnalyzedClosureExportAssign() {
+    astNode.getLhs() = any(Closure::ClosureModule mod).getExportsVariable().getAReference()
+  }
 
   override predicate writes(AbstractValue baseVal, string propName, DataFlow::AnalyzedNode source) {
     baseVal = TAbstractModuleObject(astNode.getTopLevel()) and
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll
index 558aaf267f4..6105b1b8115 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/InterProceduralTypeInference.qll
@@ -302,12 +302,11 @@ private class TypeInferredMethodWithAnalyzedReturnFlow extends CallWithNonLocalA
  * Propagates receivers into locally defined callbacks of partial invocations.
  */
 private class AnalyzedThisInPartialInvokeCallback extends AnalyzedNode, DataFlow::ThisNode {
-  DataFlow::PartialInvokeNode call;
   DataFlow::Node receiver;
 
   AnalyzedThisInPartialInvokeCallback() {
     exists(DataFlow::Node callbackArg |
-      receiver = call.getBoundReceiver(callbackArg) and
+      receiver = any(DataFlow::PartialInvokeNode call).getBoundReceiver(callbackArg) and
       getBinder().flowsTo(callbackArg)
     )
   }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll
index 37804e4c26f..f2b905086c5 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll
@@ -138,7 +138,7 @@ class AnalyzedVarDef extends VarDef {
   /**
    * Gets the toplevel syntactic unit to which this definition belongs.
    */
-  TopLevel getTopLevel() { result = this.(ASTNode).getTopLevel() }
+  TopLevel getTopLevel() { result = this.(AstNode).getTopLevel() }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll b/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll
index bea4fe9a6a0..1f47bd3e350 100644
--- a/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll
+++ b/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll
@@ -35,9 +35,12 @@ abstract class Dependency extends Locatable {
  * the source tree, or a package that is referenced as a dependency
  * in a `package.json` file.
  */
-abstract class NPMDependency extends Dependency {
+abstract class NpmDependency extends Dependency {
   /** Gets the name of the NPM package this module belongs to. */
-  abstract string getNPMPackageName();
+  abstract string getNpmPackageName();
+
+  /** DEPRECATED: Alias for getNpmPackageName */
+  deprecated string getNPMPackageName() { result = this.getNpmPackageName() }
 
   /** Gets the version of the NPM package this module belongs to. */
   abstract string getVersion();
@@ -46,7 +49,7 @@ abstract class NPMDependency extends Dependency {
   abstract Import getAnImport();
 
   override predicate info(string id, string v) {
-    id = this.getNPMPackageName() and
+    id = this.getNpmPackageName() and
     v = this.getVersion()
   }
 
@@ -59,6 +62,9 @@ abstract class NPMDependency extends Dependency {
   }
 }
 
+/** DEPRECATED: Alias for NpmDependency */
+deprecated class NPMDependency = NpmDependency;
+
 /**
  * Gets a variable into which something is imported by `i`.
  */
@@ -83,23 +89,26 @@ private Expr propAccessOn(Expr e) { result.(PropAccess).getBase() = e }
  * included in the database (as opposed to an `ExternalNPMDependency`
  * which is only referenced in a `package.json` file).
  */
-class BundledNPMDependency extends NPMDependency {
-  BundledNPMDependency() {
-    exists(NPMPackage pkg | this = pkg.getAModule() |
+class BundledNpmDependency extends NpmDependency {
+  BundledNpmDependency() {
+    exists(NpmPackage pkg | this = pkg.getAModule() |
       // exclude packages marked "private": they have no globally unique ID
-      not pkg.getPackageJSON().isPrivate()
+      not pkg.getPackageJson().isPrivate()
     )
   }
 
   /** Gets the package to which this module belongs. */
-  private NPMPackage getPackage() { this = result.getAModule() }
+  private NpmPackage getPackage() { this = result.getAModule() }
 
   /** Gets the `package.json` of the package to which this module belongs. */
-  private PackageJSON getPackageJSON() { result = this.getPackage().getPackageJSON() }
+  private PackageJson getPackageJson() { result = this.getPackage().getPackageJson() }
 
-  override string getNPMPackageName() { result = this.getPackageJSON().getPackageName() }
+  override string getNpmPackageName() { result = this.getPackageJson().getPackageName() }
 
-  override string getVersion() { result = this.getPackageJSON().getVersion() }
+  /** DEPRECATED: Alias for getNpmPackageName */
+  deprecated override string getNPMPackageName() { result = this.getNpmPackageName() }
+
+  override string getVersion() { result = this.getPackageJson().getVersion() }
 
   override Import getAnImport() {
     this = result.getImportedModule() and
@@ -108,27 +117,33 @@ class BundledNPMDependency extends NPMDependency {
   }
 }
 
+/** DEPRECATED: Alias for BundledNpmDependency */
+deprecated class BundledNPMDependency = BundledNpmDependency;
+
 /**
  * An NPM package referenced in a `package.json` file.
  */
-class ExternalNPMDependency extends NPMDependency {
-  ExternalNPMDependency() {
-    exists(PackageJSON pkgjson |
-      this.(JSONString) = pkgjson.getADependenciesObject(_).getPropValue(_)
+class ExternalNpmDependency extends NpmDependency {
+  ExternalNpmDependency() {
+    exists(PackageJson pkgjson |
+      this.(JsonString) = pkgjson.getADependenciesObject(_).getPropValue(_)
     )
   }
 
   /** Gets the NPM package declaring this dependency. */
-  private NPMPackage getDeclaringPackage() {
-    this = result.getPackageJSON().getADependenciesObject(_).getPropValue(_)
+  private NpmPackage getDeclaringPackage() {
+    this = result.getPackageJson().getADependenciesObject(_).getPropValue(_)
   }
 
-  override string getNPMPackageName() {
+  override string getNpmPackageName() {
     exists(PackageDependencies pkgdeps | this = pkgdeps.getPropValue(result))
   }
 
+  /** DEPRECATED: Alias for getNpmPackageName */
+  deprecated override string getNPMPackageName() { result = this.getNpmPackageName() }
+
   private string getVersionNumber() {
-    exists(string versionRange | versionRange = this.(JSONString).getValue() |
+    exists(string versionRange | versionRange = this.(JsonString).getValue() |
       // extract a concrete version from the version range; currently,
       // we handle exact versions as well as `<=`, `>=`, `~` and `^` ranges
       result = versionRange.regexpCapture("(?:[><]=|[=~^])?v?(\\d+(\\.\\d+){1,2})", 1)
@@ -151,13 +166,16 @@ class ExternalNPMDependency extends NPMDependency {
   }
 }
 
+/** DEPRECATED: Alias for ExternalNpmDependency */
+deprecated class ExternalNPMDependency = ExternalNpmDependency;
+
 /**
  * Holds if import `i` may refer to the declared dependency `dep` of package `pkg`,
  * where the result value is the nesting depth of the file containing `i` within `pkg`.
  */
-private int importsDependency(Import i, NPMPackage pkg, NPMDependency dep) {
+private int importsDependency(Import i, NpmPackage pkg, NpmDependency dep) {
   exists(string name |
-    dep = pkg.getPackageJSON().getADependenciesObject(_).getPropValue(name) and
+    dep = pkg.getPackageJson().getADependenciesObject(_).getPropValue(name) and
     not exists(i.getImportedModule()) and
     i.getImportedPath().getComponent(0) = name and
     i.getEnclosingModule() = pkg.getAModule() and
diff --git a/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll b/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll
index 0eed07a6962..0d4664a79f4 100644
--- a/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll
@@ -125,9 +125,9 @@ abstract class FrameworkLibraryWithMarkerComment extends FrameworkLibrary {
  * A framework library that is referenced by URLs that have a certain
  * pattern.
  */
-abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
+abstract class FrameworkLibraryWithUrlRegex extends FrameworkLibrary {
   bindingset[this]
-  FrameworkLibraryWithURLRegex() { this = this }
+  FrameworkLibraryWithUrlRegex() { this = this }
 
   /**
    * Gets a regular expression that can be used to identify a URL referring
@@ -136,9 +136,15 @@ abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
    * The first capture group of this regular expression should match
    * the version number.
    */
-  abstract string getAURLRegex();
+  abstract string getAUrlRegex();
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated string getAURLRegex() { result = this.getAUrlRegex() }
 }
 
+/** DEPRECATED: Alias for FrameworkLibraryWithUrlRegex */
+deprecated class FrameworkLibraryWithURLRegex = FrameworkLibraryWithUrlRegex;
+
 /**
  * A framework library that is referenced by URLs containing the name
  * of the framework (or an alias) and a version string.
@@ -154,14 +160,14 @@ abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
  *
  * See `variantRegex()` below for a discussion of variant suffixes.
  */
-abstract class FrameworkLibraryWithGenericURL extends FrameworkLibraryWithURLRegex {
+abstract class FrameworkLibraryWithGenericUrl extends FrameworkLibraryWithUrlRegex {
   bindingset[this]
-  FrameworkLibraryWithGenericURL() { this = this }
+  FrameworkLibraryWithGenericUrl() { this = this }
 
   /** Gets an alternative name of this library. */
   string getAnAlias() { none() }
 
-  override string getAURLRegex() {
+  override string getAUrlRegex() {
     exists(string id | id = this.getId() or id = this.getAnAlias() |
       result = ".*(?:^|/)" + id + "-(" + semverRegex() + ")" + variantRegex() + "\\.js" or
       result =
@@ -169,8 +175,14 @@ abstract class FrameworkLibraryWithGenericURL extends FrameworkLibraryWithURLReg
           "\\.js"
     )
   }
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated override string getAURLRegex() { result = this.getAUrlRegex() }
 }
 
+/** DEPRECATED: Alias for FrameworkLibraryWithGenericUrl */
+deprecated class FrameworkLibraryWithGenericURL = FrameworkLibraryWithGenericUrl;
+
 /**
  * Gets a regular expression identifying suffixes that are commonly appended
  * to the name of a library to distinguish minor variants.
@@ -264,20 +276,23 @@ private predicate matchMarkerComment(
 /**
  * A reference to a `FrameworkLibraryWithURL`.
  */
-class FrameworkLibraryReferenceWithURL extends FrameworkLibraryReference {
-  FrameworkLibraryReferenceWithURL() { matchURL(this, _, _) }
+class FrameworkLibraryReferenceWithUrl extends FrameworkLibraryReference {
+  FrameworkLibraryReferenceWithUrl() { matchUrl(this, _, _) }
 
-  override predicate info(FrameworkLibrary fl, string v) { matchURL(this, fl, v) }
+  override predicate info(FrameworkLibrary fl, string v) { matchUrl(this, fl, v) }
 }
 
+/** DEPRECATED: Alias for FrameworkLibraryReferenceWithUrl */
+deprecated class FrameworkLibraryReferenceWithURL = FrameworkLibraryReferenceWithUrl;
+
 /**
  * Holds if the value of `src` attribute `attr` matches the URL pattern of library
  * `fl` at `version`.
  */
-private predicate matchURL(HTML::Attribute attr, FrameworkLibraryWithURLRegex fl, string version) {
+private predicate matchUrl(HTML::Attribute attr, FrameworkLibraryWithUrlRegex fl, string version) {
   attr.getName() = "src" and
   attr.getElement() instanceof HTML::ScriptElement and
-  version = attr.getValue().regexpCapture(fl.getAURLRegex(), 1)
+  version = attr.getValue().regexpCapture(fl.getAUrlRegex(), 1)
 }
 
 /**
@@ -288,7 +303,7 @@ private string versionRegex() { result = "\\d+\\.\\d+[A-Za-z0-9.+_-]*" }
 /**
  * The jQuery framework.
  */
-private class JQuery extends FrameworkLibraryWithGenericURL {
+private class JQuery extends FrameworkLibraryWithGenericUrl {
   JQuery() { this = "jquery" }
 
   override string getAnEntryPoint() { result = "$" or result = "jQuery" }
@@ -331,7 +346,7 @@ private class JQueryInstance extends FrameworkLibraryInstance {
 /**
  * The jQuery Mobile framework.
  */
-private class JQueryMobile extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class JQueryMobile extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   JQueryMobile() { this = "jquery-mobile" }
 
   override string getAnAlias() { result = "jquery.mobile" }
@@ -344,7 +359,7 @@ private class JQueryMobile extends FrameworkLibraryWithGenericURL, FrameworkLibr
 /**
  * The jQuery UI framework.
  */
-private class JQueryUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class JQueryUI extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   JQueryUI() { this = "jquery-ui" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*jQuery UI - v?(<VERSION>).*" }
@@ -355,7 +370,7 @@ private class JQueryUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryW
 /**
  * The jQuery TextExt framework.
  */
-private class JQueryTextExt extends FrameworkLibraryWithGenericURL,
+private class JQueryTextExt extends FrameworkLibraryWithGenericUrl,
   FrameworkLibraryWithMarkerComment {
   JQueryTextExt() { this = "jquery-textext" }
 
@@ -371,7 +386,7 @@ private class JQueryTextExt extends FrameworkLibraryWithGenericURL,
 /**
  * The jQuery DataTables framework.
  */
-private class JQueryDataTables extends FrameworkLibraryWithGenericURL,
+private class JQueryDataTables extends FrameworkLibraryWithGenericUrl,
   FrameworkLibraryWithMarkerComment {
   JQueryDataTables() { this = "jquery-dataTables" }
 
@@ -385,7 +400,7 @@ private class JQueryDataTables extends FrameworkLibraryWithGenericURL,
 /**
  * The jQuery jsTree framework.
  */
-private class JQueryJsTree extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class JQueryJsTree extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   JQueryJsTree() { this = "jquery-jstree" }
 
   override string getAnAlias() { result = "jquery.jstree" }
@@ -396,7 +411,7 @@ private class JQueryJsTree extends FrameworkLibraryWithGenericURL, FrameworkLibr
 /**
  * The jQuery Snippet framework.
  */
-private class JQuerySnippet extends FrameworkLibraryWithGenericURL,
+private class JQuerySnippet extends FrameworkLibraryWithGenericUrl,
   FrameworkLibraryWithMarkerComment {
   JQuerySnippet() { this = "jquery-snippet" }
 
@@ -410,7 +425,7 @@ private class JQuerySnippet extends FrameworkLibraryWithGenericURL,
 /**
  * The Bootstrap framework.
  */
-private class Bootstrap extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Bootstrap extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Bootstrap() { this = "bootstrap" }
 
   override string getAMarkerCommentRegex() {
@@ -423,7 +438,7 @@ private class Bootstrap extends FrameworkLibraryWithGenericURL, FrameworkLibrary
 /**
  * The Modernizr framework.
  */
-private class Modernizr extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Modernizr extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Modernizr() { this = "modernizr" }
 
   override string getAMarkerCommentRegex() {
@@ -436,7 +451,7 @@ private class Modernizr extends FrameworkLibraryWithGenericURL, FrameworkLibrary
 /**
  * The MooTools framework.
  */
-private class MooTools extends FrameworkLibraryWithGenericURL {
+private class MooTools extends FrameworkLibraryWithGenericUrl {
   MooTools() { this = "mootools" }
 
   override string getAnEntryPoint() { /* not easily detectable */ none() }
@@ -479,7 +494,7 @@ private class MooToolsInstance extends FrameworkLibraryInstance {
 /**
  * The Prototype framework.
  */
-private class Prototype extends FrameworkLibraryWithGenericURL {
+private class Prototype extends FrameworkLibraryWithGenericUrl {
   Prototype() { this = "prototype" }
 
   override string getAnEntryPoint() { /* not easily detectable */ none() }
@@ -518,7 +533,7 @@ private class PrototypeInstance extends FrameworkLibraryInstance {
 /**
  * The Scriptaculous framework.
  */
-private class Scriptaculous extends FrameworkLibraryWithGenericURL {
+private class Scriptaculous extends FrameworkLibraryWithGenericUrl {
   Scriptaculous() { this = "scriptaculous" }
 
   override string getAnEntryPoint() { /* not easily detectable */ none() }
@@ -557,7 +572,7 @@ private class ScriptaculousInstance extends FrameworkLibraryInstance {
 /**
  * The Underscore framework.
  */
-private class Underscore extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Underscore extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Underscore() { this = "underscore" }
 
   override string getAMarkerCommentRegex() { result = "^\\s*Underscore.js (<VERSION>).*" }
@@ -568,7 +583,7 @@ private class Underscore extends FrameworkLibraryWithGenericURL, FrameworkLibrar
 /**
  * The Lodash framework.
  */
-private class Lodash extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Lodash extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Lodash() { this = "lodash" }
 
   override string getAMarkerCommentRegex() {
@@ -581,7 +596,7 @@ private class Lodash extends FrameworkLibraryWithGenericURL, FrameworkLibraryWit
 }
 
 /** The Dojo framework. */
-private class Dojo extends FrameworkLibraryWithGenericURL {
+private class Dojo extends FrameworkLibraryWithGenericUrl {
   Dojo() { this = "dojo" }
 
   override string getAnEntryPoint() { result = "dojo" }
@@ -613,7 +628,7 @@ private class DojoInstance extends FrameworkLibraryInstance {
 /**
  * The ExtJS framework.
  */
-private class ExtJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class ExtJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   ExtJS() { this = "extjs" }
 
   override string getAMarkerCommentRegex() {
@@ -629,7 +644,7 @@ private class ExtJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
 /**
  * The YUI framework.
  */
-private class YUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class YUI extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   YUI() { this = "yui" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*YUI (<VERSION>) \\(build \\d+\\).*" }
@@ -640,7 +655,7 @@ private class YUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMa
 /**
  * The Knockout framework.
  */
-private class Knockout extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Knockout extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Knockout() { this = "knockout" }
 
   override string getAMarkerCommentRegex() {
@@ -653,7 +668,7 @@ private class Knockout extends FrameworkLibraryWithGenericURL, FrameworkLibraryW
 /**
  * The AngularJS framework.
  */
-private class AngularJS extends FrameworkLibraryWithGenericURL {
+private class AngularJS extends FrameworkLibraryWithGenericUrl {
   AngularJS() { this = "angularjs" }
 
   override string getAnAlias() { result = "angular" or result = "angular2" }
@@ -691,7 +706,7 @@ private class AngularJSInstance extends FrameworkLibraryInstance {
 /**
  * The Angular UI bootstrap framework.
  */
-private class AngularUIBootstrap extends FrameworkLibraryWithGenericURL {
+private class AngularUIBootstrap extends FrameworkLibraryWithGenericUrl {
   AngularUIBootstrap() { this = "angular-ui-bootstrap" }
 
   override string getAnAlias() { result = "ui-bootstrap" }
@@ -722,7 +737,7 @@ private class AngularUIBootstrapInstance extends FrameworkLibraryInstance {
 /**
  * The React framework.
  */
-private class React extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class React extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   React() { this = "react" }
 
   override string getAMarkerCommentRegex() {
@@ -733,15 +748,15 @@ private class React extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
 /**
  * The Microsoft AJAX Framework.
  */
-private class MicrosoftAJAXFramework extends FrameworkLibrary {
-  MicrosoftAJAXFramework() { this = "microsoft-ajax-framework" }
+private class MicrosoftAjaxFramework extends FrameworkLibrary {
+  MicrosoftAjaxFramework() { this = "microsoft-ajax-framework" }
 }
 
 /**
  * Holds if comments `c1` and `c2` in toplevel `tl` are marker comments for the given
  * `version` of the Microsoft AJAX Framework.
  */
-private predicate microsoftAJAXFrameworkMarkerComments(
+private predicate microsoftAjaxFrameworkMarkerComments(
   Comment c1, Comment c2, TopLevel tl, string version
 ) {
   tl = c1.getTopLevel() and
@@ -753,19 +768,19 @@ private predicate microsoftAJAXFrameworkMarkerComments(
 /**
  * A copy of the Microsoft AJAX Framework.
  */
-private class MicrosoftAJAXFrameworkInstance extends FrameworkLibraryInstance {
-  MicrosoftAJAXFrameworkInstance() { microsoftAJAXFrameworkMarkerComments(_, _, this, _) }
+private class MicrosoftAjaxFrameworkInstance extends FrameworkLibraryInstance {
+  MicrosoftAjaxFrameworkInstance() { microsoftAjaxFrameworkMarkerComments(_, _, this, _) }
 
   override predicate info(FrameworkLibrary fl, string v) {
-    fl instanceof MicrosoftAJAXFramework and
-    microsoftAJAXFrameworkMarkerComments(_, _, this, v)
+    fl instanceof MicrosoftAjaxFramework and
+    microsoftAjaxFrameworkMarkerComments(_, _, this, v)
   }
 }
 
 /**
  * The Polymer framework.
  */
-private class Polymer extends FrameworkLibraryWithGenericURL {
+private class Polymer extends FrameworkLibraryWithGenericUrl {
   Polymer() { this = "polymer" }
 
   override string getAnEntryPoint() { result = "Polymer" }
@@ -800,7 +815,7 @@ private class PolymerInstance extends FrameworkLibraryInstance {
 /**
  * The Vue.js framework.
  */
-private class VueJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class VueJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   VueJS() { this = "vue" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*Vue\\.js v(<VERSION>).*" }
@@ -811,7 +826,7 @@ private class VueJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
 /**
  * The Swagger UI framework.
  */
-private class SwaggerUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class SwaggerUI extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   SwaggerUI() { this = "swagger-ui" }
 
   override string getAMarkerCommentRegex() {
@@ -822,7 +837,7 @@ private class SwaggerUI extends FrameworkLibraryWithGenericURL, FrameworkLibrary
 /**
  * The Backbone.js framework.
  */
-private class BackboneJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class BackboneJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   BackboneJS() { this = "backbone" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*Backbone\\.js (<VERSION>).*" }
@@ -833,7 +848,7 @@ private class BackboneJS extends FrameworkLibraryWithGenericURL, FrameworkLibrar
 /**
  * The Ember.js framework.
  */
-private class EmberJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class EmberJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   EmberJS() { this = "ember" }
 
   override string getAMarkerCommentRegex() {
@@ -846,7 +861,7 @@ private class EmberJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
 /**
  * The QUnit.js framework.
  */
-private class QUnitJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class QUnitJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   QUnitJS() { this = "qunit" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*QUnit\\s*(<VERSION>).*" }
@@ -857,28 +872,28 @@ private class QUnitJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
 /**
  * The Mocha framework.
  */
-private class Mocha extends FrameworkLibraryWithGenericURL {
+private class Mocha extends FrameworkLibraryWithGenericUrl {
   Mocha() { this = "mocha" }
 }
 
 /**
  * The Jasmine framework.
  */
-private class Jasmine extends FrameworkLibraryWithGenericURL {
+private class Jasmine extends FrameworkLibraryWithGenericUrl {
   Jasmine() { this = "jasmine" }
 }
 
 /**
  * The Chai framework.
  */
-private class Chai extends FrameworkLibraryWithGenericURL {
+private class Chai extends FrameworkLibraryWithGenericUrl {
   Chai() { this = "chai" }
 }
 
 /**
  * The Sinon.JS framework.
  */
-private class SinonJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class SinonJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   SinonJS() { this = "sinon" }
 
   override string getAnAlias() { result = "sinon-ie" or result = "sinon-timers" }
@@ -889,7 +904,7 @@ private class SinonJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
 /**
  * The TinyMCE framework.
  */
-private class TinyMCE extends FrameworkLibraryWithGenericURL {
+private class TinyMCE extends FrameworkLibraryWithGenericUrl {
   TinyMCE() { this = "tinymce" }
 
   override string getAnAlias() { result = "jquery.tinymce" or result = "tinymce.jquery" }
@@ -898,7 +913,7 @@ private class TinyMCE extends FrameworkLibraryWithGenericURL {
 /**
  * The Require.js framework.
  */
-private class RequireJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class RequireJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   RequireJS() { this = "requirejs" }
 
   override string getAnAlias() { result = "require.js" }
@@ -917,7 +932,7 @@ private class ApplicationInsightsInstance extends FrameworkLibraryInstance {
       this.(TopLevel)
           .getFile()
           .getAbsolutePath()
-          .regexpCapture(any(ApplicationInsights t).getAURLRegex(), 1)
+          .regexpCapture(any(ApplicationInsights t).getAUrlRegex(), 1)
   }
 
   override predicate info(FrameworkLibrary fl, string v) {
@@ -929,16 +944,19 @@ private class ApplicationInsightsInstance extends FrameworkLibraryInstance {
 /**
  * The Microsoft ApplicationInsights framework.
  */
-private class ApplicationInsights extends FrameworkLibraryWithURLRegex {
+private class ApplicationInsights extends FrameworkLibraryWithUrlRegex {
   ApplicationInsights() { this = "ApplicationInsights" }
 
-  override string getAURLRegex() { result = ".*(?:^|/)ai\\.(" + semverRegex() + ")-build\\d+\\.js" }
+  override string getAUrlRegex() { result = ".*(?:^|/)ai\\.(" + semverRegex() + ")-build\\d+\\.js" }
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated override string getAURLRegex() { result = this.getAUrlRegex() }
 }
 
 /**
  * The twitter-text framework.
  */
-private class TwitterText extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class TwitterText extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   TwitterText() { this = "twitter-text" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*twitter-text\\s*(<VERSION>).*" }
@@ -947,10 +965,13 @@ private class TwitterText extends FrameworkLibraryWithGenericURL, FrameworkLibra
 /**
  * The classic version of twitter-text, as seen in the wild.
  */
-private class TwitterTextClassic extends FrameworkLibraryWithURLRegex {
+private class TwitterTextClassic extends FrameworkLibraryWithUrlRegex {
   TwitterTextClassic() { this = "twitter-text" }
 
-  override string getAURLRegex() { result = ".*(?:^|/)twitter_text" + variantRegex() + "\\.js" }
+  override string getAUrlRegex() { result = ".*(?:^|/)twitter_text" + variantRegex() + "\\.js" }
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated override string getAURLRegex() { result = this.getAUrlRegex() }
 }
 
 /**
@@ -961,7 +982,7 @@ private class TwitterTextClassicInstance extends FrameworkLibraryInstance {
     this.(TopLevel)
         .getFile()
         .getAbsolutePath()
-        .regexpMatch(any(TwitterTextClassic t).getAURLRegex())
+        .regexpMatch(any(TwitterTextClassic t).getAUrlRegex())
   }
 
   override predicate info(FrameworkLibrary fl, string v) {
diff --git a/javascript/ql/lib/semmle/javascript/explore/BackwardDataFlow.qll b/javascript/ql/lib/semmle/javascript/explore/BackwardDataFlow.qll
index 4d08d21d0bf..8799cb3128a 100644
--- a/javascript/ql/lib/semmle/javascript/explore/BackwardDataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/explore/BackwardDataFlow.qll
@@ -16,9 +16,7 @@
 import javascript
 
 private class BackwardExploringConfiguration extends DataFlow::Configuration {
-  DataFlow::Configuration cfg;
-
-  BackwardExploringConfiguration() { this = cfg }
+  BackwardExploringConfiguration() { this = any(DataFlow::Configuration cfg) }
 
   override predicate isSource(DataFlow::Node node) { any() }
 
diff --git a/javascript/ql/lib/semmle/javascript/explore/ForwardDataFlow.qll b/javascript/ql/lib/semmle/javascript/explore/ForwardDataFlow.qll
index 20f6b67c6e4..c08375c9244 100644
--- a/javascript/ql/lib/semmle/javascript/explore/ForwardDataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/explore/ForwardDataFlow.qll
@@ -14,9 +14,7 @@
 import javascript
 
 private class ForwardExploringConfiguration extends DataFlow::Configuration {
-  DataFlow::Configuration cfg;
-
-  ForwardExploringConfiguration() { this = cfg }
+  ForwardExploringConfiguration() { this = any(DataFlow::Configuration cfg) }
 
   override predicate isSink(DataFlow::Node node) { any() }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
index 29038ac8306..f7975a8c198 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
@@ -149,12 +149,10 @@ DataFlow::CallNode moduleRef(AngularModule m) {
  * A call to a method from the `angular.Module` API.
  */
 class ModuleApiCall extends DataFlow::CallNode {
-  /** The module on which the method is called. */
-  AngularModule mod;
   /** The name of the called method. */
   string methodName;
 
-  ModuleApiCall() { this = moduleRef(mod).getAMethodCall(methodName) }
+  ModuleApiCall() { this = moduleRef(_).getAMethodCall(methodName) }
 
   /**
    * Gets the name of the invoked method.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll
index da8a915566c..56fca49cd10 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSExpressions.qll
@@ -65,10 +65,9 @@ private string getInterpolatedExpressionPattern() { result = "(?<=\\{\\{).*?(?=\
  */
 private class HtmlTextNodeAsNgSourceProvider extends NgSourceProvider, HTML::TextNode {
   string source;
-  int offset;
 
   HtmlTextNodeAsNgSourceProvider() {
-    source = this.getText().regexpFind(getInterpolatedExpressionPattern(), _, offset)
+    source = this.getText().regexpFind(getInterpolatedExpressionPattern(), _, _)
   }
 
   override predicate providesSourceAt(
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
index 01be5035325..6f5aaf7d38f 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
@@ -46,23 +46,23 @@ abstract class InjectableFunction extends DataFlow::ValueNode {
   /**
    * Gets the `i`th dependency declaration, which is also named `name`.
    */
-  abstract ASTNode getDependencyDeclaration(int i, string name);
+  abstract AstNode getDependencyDeclaration(int i, string name);
 
   /**
    * Gets an ASTNode for the `name` dependency declaration.
    */
-  ASTNode getADependencyDeclaration(string name) { result = getDependencyDeclaration(_, name) }
+  AstNode getADependencyDeclaration(string name) { result = getDependencyDeclaration(_, name) }
 
   /**
    * Gets the ASTNode for the `i`th dependency declaration.
    */
-  ASTNode getDependencyDeclaration(int i) { result = getDependencyDeclaration(i, _) }
+  AstNode getDependencyDeclaration(int i) { result = getDependencyDeclaration(i, _) }
 
   /** Gets the function underlying this injectable function. */
   abstract Function asFunction();
 
   /** Gets a location where this function is explicitly dependency injected. */
-  abstract ASTNode getAnExplicitDependencyInjection();
+  abstract AstNode getAnExplicitDependencyInjection();
 
   /**
    * Gets a service corresponding to the dependency-injected `parameter`.
@@ -110,7 +110,7 @@ private class FunctionWithImplicitDependencyAnnotation extends InjectableFunctio
 
   override Function asFunction() { result = astNode }
 
-  override ASTNode getAnExplicitDependencyInjection() { none() }
+  override AstNode getAnExplicitDependencyInjection() { none() }
 }
 
 private DataFlow::PropWrite getAPropertyDependencyInjection(Function function) {
@@ -143,7 +143,7 @@ private class FunctionWithInjectProperty extends InjectableFunction {
     exists(int i | exists(getDependencyDeclaration(i, name)) | result = astNode.getParameter(i))
   }
 
-  override ASTNode getDependencyDeclaration(int i, string name) {
+  override AstNode getDependencyDeclaration(int i, string name) {
     exists(DataFlow::ValueNode decl |
       decl = dependencies.getElement(i) and
       decl.mayHaveStringValue(name) and
@@ -153,7 +153,7 @@ private class FunctionWithInjectProperty extends InjectableFunction {
 
   override Function asFunction() { result = astNode }
 
-  override ASTNode getAnExplicitDependencyInjection() {
+  override AstNode getAnExplicitDependencyInjection() {
     result = getAPropertyDependencyInjection(astNode).getAstNode()
   }
 }
@@ -176,14 +176,14 @@ private class FunctionWithExplicitDependencyAnnotation extends InjectableFunctio
     )
   }
 
-  override ASTNode getDependencyDeclaration(int i, string name) {
+  override AstNode getDependencyDeclaration(int i, string name) {
     result = astNode.getElement(i) and
     result.(Expr).mayHaveStringValue(name)
   }
 
   override Function asFunction() { result = function.getAstNode() }
 
-  override ASTNode getAnExplicitDependencyInjection() {
+  override AstNode getAnExplicitDependencyInjection() {
     result = astNode or
     result = function.(InjectableFunction).getAnExplicitDependencyInjection()
   }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll b/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
index 05dec2172be..3d061eb2aef 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
@@ -9,18 +9,18 @@ module Babel {
    * A Babel configuration object, either from `package.json` or from a
    * `.babelrc` file.
    */
-  class Config extends JSONObject {
+  class Config extends JsonObject {
     Config() {
       isTopLevel() and getJsonFile().getBaseName().matches(".babelrc%")
       or
-      this = any(PackageJSON pkg).getPropValue("babel")
+      this = any(PackageJson pkg).getPropValue("babel")
     }
 
     /**
      * Gets the configuration for the plugin with the given name.
      */
-    JSONValue getPluginConfig(string pluginName) {
-      exists(JSONArray plugins |
+    JsonValue getPluginConfig(string pluginName) {
+      exists(JsonArray plugins |
         plugins = getPropValue("plugins") and
         result = plugins.getElementValue(_)
       |
@@ -38,7 +38,7 @@ module Babel {
       or
       result = getAContainerInScope().getAChildContainer() and
       // File-relative .babelrc search stops at any package.json or .babelrc file.
-      not result.getAChildContainer() = any(PackageJSON pkg).getJsonFile() and
+      not result.getAChildContainer() = any(PackageJson pkg).getJsonFile() and
       not result.getAChildContainer() = any(Config pkg).getJsonFile()
     }
 
@@ -51,7 +51,7 @@ module Babel {
   /**
    * A configuration object for a Babel plugin.
    */
-  class Plugin extends JSONValue {
+  class Plugin extends JsonValue {
     Config cfg;
     string pluginName;
 
@@ -64,10 +64,10 @@ module Babel {
     Config getConfig() { result = cfg }
 
     /** Gets the options value passed to the plugin, if any. */
-    JSONValue getOptions() { result = this.(JSONArray).getElementValue(1) }
+    JsonValue getOptions() { result = this.(JsonArray).getElementValue(1) }
 
     /** Gets a named option from the option object, if present. */
-    JSONValue getOption(string name) { result = getOptions().getPropValue(name) }
+    JsonValue getOption(string name) { result = getOptions().getPropValue(name) }
 
     /** Holds if this plugin applies to `tl`. */
     predicate appliesTo(TopLevel tl) { cfg.appliesTo(tl) }
@@ -99,12 +99,12 @@ module Babel {
     /**
      * Gets an object specifying a root prefix.
      */
-    private JSONObject getARootPathSpec() {
+    private JsonObject getARootPathSpec() {
       // ["babel-plugin-root-import", <spec>]
       result = getOptions() and
       exists(result.getPropValue("rootPathSuffix"))
       or
-      exists(JSONArray pathSpecs |
+      exists(JsonArray pathSpecs |
         // ["babel-plugin-root-import", [ <spec>... ] ]
         pathSpecs = getOptions()
         or
@@ -119,7 +119,7 @@ module Babel {
      * Gets the (explicitly specified) root for the given prefix.
      */
     private string getExplicitRoot(string prefix) {
-      exists(JSONObject rootPathSpec |
+      exists(JsonObject rootPathSpec |
         rootPathSpec = getARootPathSpec() and
         result = rootPathSpec.getPropStringValue("rootPathSuffix")
       |
@@ -140,7 +140,6 @@ module Babel {
    */
   private class BabelRootTransformedPathExpr extends PathExpr, Expr {
     RootImportConfig plugin;
-    string rawPath;
     string prefix;
     string mappedPrefix;
     string suffix;
@@ -148,9 +147,8 @@ module Babel {
     BabelRootTransformedPathExpr() {
       this instanceof PathExpr and
       plugin.appliesTo(getTopLevel()) and
-      rawPath = getStringValue() and
-      prefix = rawPath.regexpCapture("(.)/(.*)", 1) and
-      suffix = rawPath.regexpCapture("(.)/(.*)", 2) and
+      prefix = getStringValue().regexpCapture("(.)/(.*)", 1) and
+      suffix = getStringValue().regexpCapture("(.)/(.*)", 2) and
       mappedPrefix = plugin.getRoot(prefix)
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
index 2c304853a7f..d6006545827 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
@@ -71,8 +71,6 @@ class ClientRequest extends DataFlow::InvokeNode instanceof ClientRequest::Range
   DataFlow::Node getASavePath() { result = super.getASavePath() }
 }
 
-deprecated class CustomClientRequest = ClientRequest::Range;
-
 module ClientRequest {
   /**
    * A call that performs a request to a URL.
@@ -548,8 +546,8 @@ module ClientRequest {
    *
    * Note: Prefer to use the `ClientRequest` class as it is more general.
    */
-  class XMLHttpRequest extends ClientRequest::Range {
-    XMLHttpRequest() {
+  class XmlHttpRequest extends ClientRequest::Range {
+    XmlHttpRequest() {
       this = DataFlow::globalVarRef("XMLHttpRequest").getAnInstantiation()
       or
       // closure shim for XMLHttpRequest
@@ -620,6 +618,9 @@ module ClientRequest {
     }
   }
 
+  /** DEPRECATED: Alias for XmlHttpRequest */
+  deprecated class XMLHttpRequest = XmlHttpRequest;
+
   /**
    * A model of a URL request made using the `XhrIo` class from the closure library.
    */
@@ -790,8 +791,8 @@ module ClientRequest {
   /**
    * A model of a URL request made using `jsdom.fromUrl()`.
    */
-  class JSDOMFromUrl extends ClientRequest::Range {
-    JSDOMFromUrl() {
+  class JSDomFromUrl extends ClientRequest::Range {
+    JSDomFromUrl() {
       this = API::moduleImport("jsdom").getMember("JSDOM").getMember("fromURL").getACall()
     }
 
@@ -802,6 +803,9 @@ module ClientRequest {
     override DataFlow::Node getADataNode() { none() }
   }
 
+  /** DEPRECATED: Alias for JSDomFromUrl */
+  deprecated class JSDOMFromUrl = JSDomFromUrl;
+
   /**
    * Classes and predicates modeling the `apollo-client` library.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll b/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll
index 5cffe53d198..77bfff9f388 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll
@@ -367,10 +367,10 @@ private module ExpressCookies {
  * In case an array is passed `setHeader("Set-Cookie", [...]` it sets multiple cookies.
  * We model a `CookieWrite` for each array element.
  */
-private class HTTPCookieWrite extends CookieWrites::CookieWrite {
+private class HttpCookieWrite extends CookieWrites::CookieWrite {
   string header;
 
-  HTTPCookieWrite() {
+  HttpCookieWrite() {
     exists(HTTP::CookieDefinition setCookie |
       this.asExpr() = setCookie.getHeaderArgument() and
       not this instanceof DataFlow::ArrayCreationNode
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/CryptoLibraries.qll b/javascript/ql/lib/semmle/javascript/frameworks/CryptoLibraries.qll
index 38ceece844b..617d1720ab1 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/CryptoLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/CryptoLibraries.qll
@@ -378,10 +378,9 @@ private module CryptoJS {
  * A model of the TweetNaCl library.
  */
 private module TweetNaCl {
-  private class Apply extends CryptographicOperation {
+  private class Apply extends CryptographicOperation instanceof MethodCallExpr {
     Expr input;
     CryptographicAlgorithm algorithm;
-    MethodCallExpr mce;
 
     Apply() {
       /*
@@ -395,15 +394,14 @@ private module TweetNaCl {
        *      Also matches the "hash" method name, and the "nacl-fast" module.
        */
 
-      this = mce and
       exists(DataFlow::SourceNode mod, string name |
         name = "hash" and algorithm.matchesName("SHA512")
         or
         name = "sign" and algorithm.matchesName("ed25519")
       |
         (mod = DataFlow::moduleImport("nacl") or mod = DataFlow::moduleImport("nacl-fast")) and
-        mce = mod.getAMemberCall(name).asExpr() and
-        mce.getArgument(0) = input
+        this = mod.getAMemberCall(name).asExpr() and
+        super.getArgument(0) = input
       )
     }
 
@@ -440,10 +438,9 @@ private module HashJs {
     )
   }
 
-  private class Apply extends CryptographicOperation {
+  private class Apply extends CryptographicOperation instanceof MethodCallExpr {
     Expr input;
     CryptographicAlgorithm algorithm; // non-functional
-    MethodCallExpr mce;
 
     Apply() {
       /*
@@ -459,9 +456,8 @@ private module HashJs {
        *      Also matches where `hash.<algorithmName>()` has been replaced by a more specific require a la `require("hash.js/lib/hash/sha/512")`
        */
 
-      this = mce and
-      mce = getAlgorithmExpr(algorithm).getAMemberCall("update").asExpr() and
-      input = mce.getArgument(0)
+      this = getAlgorithmExpr(algorithm).getAMemberCall("update").asExpr() and
+      input = super.getArgument(0)
     }
 
     override Expr getInput() { result = input }
@@ -535,16 +531,14 @@ private module Forge {
     override CryptographicAlgorithm getAlgorithm() { result = algorithm }
   }
 
-  private class Apply extends CryptographicOperation {
+  private class Apply extends CryptographicOperation instanceof MethodCallExpr {
     Expr input;
     CryptographicAlgorithm algorithm; // non-functional
-    MethodCallExpr mce;
 
     Apply() {
-      this = mce and
       exists(Cipher cipher |
-        mce = cipher.getAMemberCall("update").asExpr() and
-        mce.getArgument(0) = input and
+        this = cipher.getAMemberCall("update").asExpr() and
+        super.getArgument(0) = input and
         algorithm = cipher.getAlgorithm()
       )
     }
@@ -596,19 +590,17 @@ private module Forge {
  * A model of the md5 library.
  */
 private module Md5 {
-  private class Apply extends CryptographicOperation {
+  private class Apply extends CryptographicOperation instanceof CallExpr {
     Expr input;
     CryptographicAlgorithm algorithm;
-    CallExpr call;
 
     Apply() {
       // `require("md5")("message");`
-      this = call and
       exists(DataFlow::SourceNode mod |
         mod = DataFlow::moduleImport("md5") and
         algorithm.matchesName("MD5") and
-        call = mod.getACall().asExpr() and
-        call.getArgument(0) = input
+        this = mod.getACall().asExpr() and
+        super.getArgument(0) = input
       )
     }
 
@@ -622,14 +614,12 @@ private module Md5 {
  * A model of the bcrypt, bcryptjs, bcrypt-nodejs libraries.
  */
 private module Bcrypt {
-  private class Apply extends CryptographicOperation {
+  private class Apply extends CryptographicOperation instanceof MethodCallExpr {
     Expr input;
     CryptographicAlgorithm algorithm;
-    MethodCallExpr mce;
 
     Apply() {
       // `require("bcrypt").hash(password);` with minor naming variations
-      this = mce and
       exists(DataFlow::SourceNode mod, string moduleName, string methodName |
         algorithm.matchesName("BCRYPT") and
         (
@@ -642,8 +632,8 @@ private module Bcrypt {
           methodName = "hashSync"
         ) and
         mod = DataFlow::moduleImport(moduleName) and
-        mce = mod.getAMemberCall(methodName).asExpr() and
-        mce.getArgument(0) = input
+        this = mod.getAMemberCall(methodName).asExpr() and
+        super.getArgument(0) = input
       )
     }
 
@@ -657,20 +647,18 @@ private module Bcrypt {
  * A model of the hasha library.
  */
 private module Hasha {
-  private class Apply extends CryptographicOperation {
+  private class Apply extends CryptographicOperation instanceof CallExpr {
     Expr input;
     CryptographicAlgorithm algorithm;
-    CallExpr call;
 
     Apply() {
       // `require('hasha')('unicorn', { algorithm: "md5" });`
-      this = call and
       exists(DataFlow::SourceNode mod, string algorithmName, Expr algorithmNameNode |
         mod = DataFlow::moduleImport("hasha") and
-        call = mod.getACall().asExpr() and
-        call.getArgument(0) = input and
+        this = mod.getACall().asExpr() and
+        super.getArgument(0) = input and
         algorithm.matchesName(algorithmName) and
-        call.hasOptionArgument(1, "algorithm", algorithmNameNode) and
+        super.hasOptionArgument(1, "algorithm", algorithmNameNode) and
         algorithmNameNode.mayHaveStringValue(algorithmName)
       )
     }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Electron.qll b/javascript/ql/lib/semmle/javascript/frameworks/Electron.qll
index bda05ce42b6..1b3ee3dfea5 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Electron.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Electron.qll
@@ -189,8 +189,6 @@ module Electron {
     abstract class Range extends NodeJSLib::NodeJSClientRequest::Range { }
   }
 
-  deprecated class CustomElectronClientRequest = ElectronClientRequest::Range;
-
   /**
    * A Node.js-style HTTP or HTTPS request made using `electron.ClientRequest`.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Files.qll b/javascript/ql/lib/semmle/javascript/frameworks/Files.qll
index 9e9507d4111..0bad9367b7f 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Files.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Files.qll
@@ -212,12 +212,12 @@ private class RecursiveReadDir extends FileSystemAccess, FileNameProducer, API::
 /**
  * Classes and predicates for modeling the `jsonfile` library (https://www.npmjs.com/package/jsonfile).
  */
-private module JSONFile {
+private module JsonFile {
   /**
    * A reader for JSON files.
    */
-  class JSONFileReader extends FileSystemReadAccess, API::CallNode {
-    JSONFileReader() {
+  class JsonFileReader extends FileSystemReadAccess, API::CallNode {
+    JsonFileReader() {
       this = API::moduleImport("jsonfile").getMember(["readFile", "readFileSync"]).getACall()
     }
 
@@ -238,11 +238,14 @@ private module JSONFile {
     }
   }
 
+  /** DEPRECATED: Alias for JsonFileReader */
+  deprecated class JSONFileReader = JsonFileReader;
+
   /**
    * A writer for JSON files.
    */
-  class JSONFileWriter extends FileSystemWriteAccess, DataFlow::CallNode {
-    JSONFileWriter() {
+  class JsonFileWriter extends FileSystemWriteAccess, DataFlow::CallNode {
+    JsonFileWriter() {
       this =
         DataFlow::moduleMember("jsonfile", any(string s | s = "writeFile" or s = "writeFileSync"))
             .getACall()
@@ -252,6 +255,9 @@ private module JSONFile {
 
     override DataFlow::Node getADataNode() { result = this.getArgument(1) }
   }
+
+  /** DEPRECATED: Alias for JsonFileWriter */
+  deprecated class JSONFileWriter = JsonFileWriter;
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll b/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll
index 04c5ff028f2..f82b4650668 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll
@@ -104,13 +104,6 @@ module HTTP {
     predicate isUnsafe() { not this.isSafe() }
   }
 
-  /**
-   * DEPRECATED: Use `http` or `https` directly as appropriate.
-   *
-   * Gets the string `http` or `https`.
-   */
-  deprecated string httpOrHttps() { result = "http" or result = "https" }
-
   /**
    * An expression whose value is sent as (part of) the body of an HTTP response.
    */
@@ -411,10 +404,10 @@ module HTTP {
      * E.g. `chunk` in: `http.createServer().on('request', (req, res) => req.on("data", (chunk) => ...))`.
      */
     private class ServerRequestDataEvent extends RemoteFlowSource, DataFlow::ParameterNode {
-      RequestSource req;
-
       ServerRequestDataEvent() {
-        exists(DataFlow::MethodCallNode mcn | mcn = req.ref().getAMethodCall(EventEmitter::on()) |
+        exists(DataFlow::MethodCallNode mcn, RequestSource req |
+          mcn = req.ref().getAMethodCall(EventEmitter::on())
+        |
           mcn.getArgument(0).mayHaveStringValue("data") and
           this = mcn.getABoundCallbackParameter(1, 0)
         )
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/HttpProxy.qll b/javascript/ql/lib/semmle/javascript/frameworks/HttpProxy.qll
index 8182a7d8390..2467ca0973b 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/HttpProxy.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/HttpProxy.qll
@@ -74,12 +74,13 @@ private module HttpProxy {
    */
   class ProxyListenerCallback extends NodeJSLib::RouteHandler, DataFlow::FunctionNode {
     string event;
-    API::CallNode call;
 
     ProxyListenerCallback() {
-      call = any(CreateServerCall server).getReturn().getMember(["on", "once"]).getACall() and
-      call.getParameter(0).getARhs().mayHaveStringValue(event) and
-      this = call.getParameter(1).getARhs().getAFunctionValue()
+      exists(API::CallNode call |
+        call = any(CreateServerCall server).getReturn().getMember(["on", "once"]).getACall() and
+        call.getParameter(0).getARhs().mayHaveStringValue(event) and
+        this = call.getParameter(1).getARhs().getAFunctionValue()
+      )
     }
 
     override Parameter getRequestParameter() {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll b/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll
index f4bd7a67886..21ac8aad249 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll
@@ -42,8 +42,8 @@ private module JsonWebToken {
   /**
    * The private key for a JWT as a `CredentialsExpr`.
    */
-  private class JWTKey extends CredentialsExpr {
-    JWTKey() {
+  private class JwtKey extends CredentialsExpr {
+    JwtKey() {
       this = DataFlow::moduleMember("jsonwebtoken", "sign").getACall().getArgument(1).asExpr()
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/LazyCache.qll b/javascript/ql/lib/semmle/javascript/frameworks/LazyCache.qll
index 58b5d37bedd..15240ce5cc0 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/LazyCache.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/LazyCache.qll
@@ -5,22 +5,6 @@
 import javascript
 
 module LazyCache {
-  /**
-   * DEPRECATED. DO NOT USE.
-   *
-   * A lazy-cache object, usually created through an expression of form `require('lazy-cache')(require)`.
-   */
-  deprecated class LazyCacheObject extends DataFlow::SourceNode {
-    LazyCacheObject() {
-      // Use `require` directly instead of `moduleImport` to avoid recursion.
-      // For the same reason, avoid `Import.getImportedPath`.
-      exists(Require req |
-        req.getArgument(0).getStringValue() = "lazy-cache" and
-        this = req.flow().(DataFlow::SourceNode).getAnInvocation()
-      )
-    }
-  }
-
   /**
    * A variable containing a lazy-cache object.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/LdapJS.qll b/javascript/ql/lib/semmle/javascript/frameworks/LdapJS.qll
index 6540e6f470d..853b76afdda 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/LdapJS.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/LdapJS.qll
@@ -29,9 +29,9 @@ module LdapJS {
 
   /** A reference to a LDAPjs client `search` options. */
   class SearchOptions extends API::Node {
-    ClientCall call;
-
-    SearchOptions() { call.getMethodName() = "search" and this = call.getParameter(1) }
+    SearchOptions() {
+      exists(ClientCall call | call.getMethodName() = "search" and this = call.getParameter(1))
+    }
   }
 
   /** A creation of an LDAPjs filter, or object containing a filter, that doesn't sanitizes the input. */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Logging.qll b/javascript/ql/lib/semmle/javascript/frameworks/Logging.qll
index fda54df3a41..f12e6cb4f60 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Logging.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Logging.qll
@@ -123,7 +123,7 @@ private module Winston {
 /**
  * Provides classes for working with [log4js](https://github.com/log4js-node/log4js-node).
  */
-private module log4js {
+private module Log4js {
   /**
    * A call to the log4js logging mechanism.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll b/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
index e630eb9b2a7..d131c70773a 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
@@ -21,7 +21,10 @@ module Markdown {
     /**
      * Holds if the taint-step preserves HTML.
      */
-    predicate preservesHTML() { any() }
+    predicate preservesHtml() { any() }
+
+    /** DEPRECATED: Alias for preservesHtml */
+    deprecated predicate preservesHTML() { this.preservesHtml() }
   }
 
   private class MarkdownStepAsTaintStep extends TaintTracking::SharedTaintStep {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll b/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll
index 88d626e5398..faa6a81e5c2 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll
@@ -376,11 +376,11 @@ module NestJS {
    * redirects to `https://example.com`.
    */
   private class ReturnValueAsRedirection extends ServerSideUrlRedirect::Sink {
-    NestJSRouteHandler handler;
-
     ReturnValueAsRedirection() {
-      handler.hasRedirectDecorator() and
-      this = handler.getAReturn().getALocalSource().getAPropertyWrite("url").getRhs()
+      exists(NestJSRouteHandler handler |
+        handler.hasRedirectDecorator() and
+        this = handler.getAReturn().getALocalSource().getAPropertyWrite("url").getRhs()
+      )
     }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Next.qll b/javascript/ql/lib/semmle/javascript/frameworks/Next.qll
index 1e0c96b1d8d..254901c1d7b 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Next.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Next.qll
@@ -11,7 +11,7 @@ module NextJS {
   /**
    * Gets a `package.json` that depends on the `Next.js` library.
    */
-  PackageJSON getANextPackage() { result.getDependencies().getADependency("next", _) }
+  PackageJson getANextPackage() { result.getDependencies().getADependency("next", _) }
 
   /**
    * Gets a "pages" folder in a `Next.js` application.
@@ -155,11 +155,7 @@ module NextJS {
    * A Next.js function that is exected on the server for every request, seen as a routehandler.
    */
   class NextHttpRouteHandler extends HTTP::Servers::StandardRouteHandler, DataFlow::FunctionNode {
-    Module pageModule;
-
-    NextHttpRouteHandler() {
-      this = getServerSidePropsFunction(pageModule) or this = getInitialProps(pageModule)
-    }
+    NextHttpRouteHandler() { this = getServerSidePropsFunction(_) or this = getInitialProps(_) }
   }
 
   /**
@@ -199,9 +195,9 @@ module NextJS {
    * The response (res) includes a set of Express.js-like methods,
    * and we therefore model the routehandler as an Express.js routehandler.
    */
-  class NextAPIRouteHandler extends DataFlow::FunctionNode, Express::RouteHandler,
+  class NextApiRouteHandler extends DataFlow::FunctionNode, Express::RouteHandler,
     HTTP::Servers::StandardRouteHandler {
-    NextAPIRouteHandler() {
+    NextApiRouteHandler() {
       exists(Module mod | mod.getFile().getParentContainer() = apiFolder() |
         this = mod.getAnExportedValue("default").getAFunctionValue()
       )
@@ -214,6 +210,9 @@ module NextJS {
     }
   }
 
+  /** DEPRECATED: Alias for NextApiRouteHandler */
+  deprecated class NextAPIRouteHandler = NextApiRouteHandler;
+
   /**
    * Gets a reference to a [Next.js router](https://nextjs.org/docs/api-reference/next/router).
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
index 11c0b6691b1..6889161696f 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
@@ -5,7 +5,8 @@
 import javascript
 import semmle.javascript.Promises
 
-module NoSQL {
+/** Provices classes for modelling NoSQL query sinks. */
+module NoSql {
   /** An expression that is interpreted as a NoSQL query. */
   abstract class Query extends Expr {
     /** Gets an expression that is interpreted as a code operator in this query. */
@@ -13,6 +14,9 @@ module NoSQL {
   }
 }
 
+/** DEPRECATED: Alias for NoSql */
+deprecated module NoSQL = NoSql;
+
 /**
  * Gets a value that has been assigned to the "$where" property of an object that flows to `queryArg`.
  */
@@ -78,7 +82,7 @@ private module MongoDB {
   /**
    * An expression that is interpreted as a MongoDB query.
    */
-  class Query extends NoSQL::Query {
+  class Query extends NoSql::Query {
     QueryCall qc;
 
     Query() { this = qc.getAQueryArgument().asExpr() }
@@ -512,7 +516,7 @@ private module Mongoose {
   /**
    * An expression that is interpreted as a (part of a) MongoDB query.
    */
-  class MongoDBQueryPart extends NoSQL::Query {
+  class MongoDBQueryPart extends NoSql::Query {
     MongooseFunction f;
 
     MongoDBQueryPart() { this = f.getQueryArgument().getARhs().asExpr() }
@@ -619,7 +623,7 @@ private module Minimongo {
   /**
    * An expression that is interpreted as a Minimongo query.
    */
-  class Query extends NoSQL::Query {
+  class Query extends NoSql::Query {
     QueryCall qc;
 
     Query() { this = qc.getAQueryArgument().asExpr() }
@@ -679,7 +683,7 @@ private module MarsDB {
   /**
    * An expression that is interpreted as a MarsDB query.
    */
-  class Query extends NoSQL::Query {
+  class Query extends NoSql::Query {
     QueryCall qc;
 
     Query() { this = qc.getAQueryArgument().asExpr() }
@@ -763,7 +767,7 @@ private module Redis {
   /**
    * An expression that is interpreted as a key in a Node Redis call.
    */
-  class RedisKeyArgument extends NoSQL::Query {
+  class RedisKeyArgument extends NoSql::Query {
     RedisKeyArgument() {
       exists(string method, int argIndex |
         QuerySignatures::argumentIsAmbiguousKey(method, argIndex) and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
index f52e68f9531..8f2576d58d4 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
@@ -801,11 +801,6 @@ module NodeJSLib {
     TrackedRouteHandlerCandidateWithSetup() { this = any(RouteSetup s).getARouteHandler() }
   }
 
-  /**
-   * DEPRECATED Use `VmModuleMemberInvocation` instead.
-   */
-  deprecated class VmModuleMethodCall = VmModuleMemberInvocation;
-
   /**
    * An invocation of a member from module `vm`
    */
@@ -864,8 +859,6 @@ module NodeJSLib {
     abstract class Range extends ClientRequest::Range { }
   }
 
-  deprecated class CustomNodeJSClientRequest = NodeJSClientRequest::Range;
-
   /**
    * A model of a URL request in the Node.js `http` library.
    */
@@ -1171,17 +1164,17 @@ module NodeJSLib {
    * A connection opened on a NodeJS net server.
    */
   private class NodeJSNetServerConnection extends EventEmitter::Range {
-    NodeJSNetServer server;
-
     NodeJSNetServerConnection() {
-      exists(DataFlow::MethodCallNode call |
-        call = server.ref().getAMethodCall("on") and
-        call.getArgument(0).mayHaveStringValue("connection")
-      |
-        this = call.getCallback(1).getParameter(0)
+      exists(NodeJSNetServer server |
+        exists(DataFlow::MethodCallNode call |
+          call = server.ref().getAMethodCall("on") and
+          call.getArgument(0).mayHaveStringValue("connection")
+        |
+          this = call.getCallback(1).getParameter(0)
+        )
+        or
+        this = server.getCallback([0, 1]).getParameter(0)
       )
-      or
-      this = server.getCallback([0, 1]).getParameter(0)
     }
 
     DataFlow::SourceNode ref() { result = EventEmitter::trackEventEmitter(this) }
@@ -1201,9 +1194,9 @@ module NodeJSLib {
    * A data flow node representing data received from a client to a NodeJS net server, viewed as remote user input.
    */
   private class NodeJSNetServerItemAsRemoteFlow extends RemoteFlowSource {
-    NodeJSNetServerRegistration reg;
-
-    NodeJSNetServerItemAsRemoteFlow() { this = reg.getReceivedItem(_) }
+    NodeJSNetServerItemAsRemoteFlow() {
+      this = any(NodeJSNetServerRegistration reg).getReceivedItem(_)
+    }
 
     override string getSourceType() { result = "NodeJS server" }
   }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/PropertyProjection.qll b/javascript/ql/lib/semmle/javascript/frameworks/PropertyProjection.qll
index 910c9818aad..27441f68e7e 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/PropertyProjection.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/PropertyProjection.qll
@@ -59,8 +59,6 @@ module PropertyProjection {
   }
 }
 
-deprecated class CustomPropertyProjection = PropertyProjection::Range;
-
 /**
  * Gets a callee of a simple property projection call.
  * This predicate is used exclusively in `SimplePropertyProjection`.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/React.qll b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
index bfd84dd2822..6eb1846b58a 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/React.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
@@ -23,7 +23,7 @@ DataFlow::SourceNode react() {
  * - instances from `React.createClass`
  * - stateless functional components
  */
-abstract class ReactComponent extends ASTNode {
+abstract class ReactComponent extends AstNode {
   /**
    * Gets an instance method of this component with the given name.
    */
@@ -208,7 +208,7 @@ abstract class ReactComponent extends ASTNode {
   DataFlow::Node getACandidatePropsValue(string name) {
     getACandidatePropsSource().hasPropertyWrite(name, result)
     or
-    exists(ReactJSXElement e, JSXAttribute attr |
+    exists(ReactJsxElement e, JsxAttribute attr |
       this = e.getComponent() and
       attr = e.getAttributeByName(name) and
       result.asExpr() = attr.getValue()
@@ -247,13 +247,13 @@ abstract class ReactComponent extends ASTNode {
 /**
  * Holds if `f` always returns a JSX element or fragment, or a React element.
  */
-private predicate alwaysReturnsJSXOrReactElements(Function f) {
+private predicate alwaysReturnsJsxOrReactElements(Function f) {
   forex(Expr e |
     e.flow().(DataFlow::SourceNode).flowsToExpr(f.getAReturnedExpr()) and
     // Allow returning string constants in addition to JSX/React elemnts.
     not exists(e.getStringValue())
   |
-    e instanceof JSXNode or
+    e instanceof JsxNode or
     e instanceof ReactElementDefinition
   )
 }
@@ -271,7 +271,7 @@ class FunctionalComponent extends ReactComponent, Function {
       p.getName().regexpMatch("(?i).*props.*") or
       p instanceof ObjectPattern
     ) and
-    alwaysReturnsJSXOrReactElements(this)
+    alwaysReturnsJsxOrReactElements(this)
   }
 
   override Function getInstanceMethod(string name) { name = "render" and result = this }
@@ -420,7 +420,7 @@ private class HeuristicReactPreactComponent extends ClassDefinition, PreactCompo
   ES2015Component {
   HeuristicReactPreactComponent() {
     any(DataFlow::GlobalVarRefNode c | c.getName() = "Component").flowsToExpr(getSuperClass()) and
-    alwaysReturnsJSXOrReactElements(ClassDefinition.super.getInstanceMethod("render"))
+    alwaysReturnsJsxOrReactElements(ClassDefinition.super.getInstanceMethod("render"))
   }
 }
 
@@ -549,10 +549,10 @@ private class ReactCallbackPartialInvoke extends DataFlow::PartialInvokeNode::Ra
 /**
  * A `JSXElement` that instantiates a `ReactComponent`.
  */
-private class ReactJSXElement extends JSXElement {
+private class ReactJsxElement extends JsxElement {
   ReactComponent component;
 
-  ReactJSXElement() { component.getAComponentCreatorReference().flowsToExpr(getNameExpr()) }
+  ReactJsxElement() { component.getAComponentCreatorReference().flowsToExpr(getNameExpr()) }
 
   /**
    * Gets the component this element instantiates.
@@ -646,7 +646,7 @@ private DataFlow::Node getAContextInput(DataFlow::CallNode createContext) {
   createContext = react().getAMemberCall("createContext") and
   result = createContext.getArgument(0) // initial value
   or
-  exists(JSXElement provider |
+  exists(JsxElement provider |
     getAContextRef(createContext)
         .getAPropertyRead("Provider")
         .flowsTo(provider.getNameExpr().flow()) and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll b/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll
index f639a163f60..a64edda01e9 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll
@@ -7,7 +7,7 @@ import javascript
 module ReactNative {
   /** A `WebView` JSX element. */
   class WebViewElement extends DataFlow::ValueNode, DataFlow::SourceNode {
-    override JSXElement astNode;
+    override JsxElement astNode;
 
     WebViewElement() {
       DataFlow::moduleMember("react-native", "WebView").flowsToExpr(astNode.getNameExpr())
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll b/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll
index 529edb64976..95e222f57ab 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll
@@ -16,19 +16,19 @@ module Redux {
    */
   private module ProgramSlicing {
     /** Gets the innermost `package.json` file in a directory containing the given file. */
-    private PackageJSON getPackageJson(Container f) {
+    private PackageJson getPackageJson(Container f) {
       f = result.getFile().getParentContainer()
       or
       not exists(f.getFile("package.json")) and
       result = getPackageJson(f.getParentContainer())
     }
 
-    private predicate packageDependsOn(PackageJSON importer, PackageJSON dependency) {
+    private predicate packageDependsOn(PackageJson importer, PackageJson dependency) {
       importer.getADependenciesObject("").getADependency(dependency.getPackageName(), _)
     }
 
     /** Gets a package that can be considered an entry point for a Redux app. */
-    private PackageJSON entryPointPackage() {
+    private PackageJson entryPointPackage() {
       result = getPackageJson(any(StoreCreation c).getFile())
       or
       // Any package that imports a store-creating package is considered a potential entry point.
@@ -36,8 +36,8 @@ module Redux {
     }
 
     pragma[nomagic]
-    private predicate arePackagesInSameReduxApp(PackageJSON a, PackageJSON b) {
-      exists(PackageJSON entry |
+    private predicate arePackagesInSameReduxApp(PackageJson a, PackageJson b) {
+      exists(PackageJson entry |
         entry = entryPointPackage() and
         packageDependsOn*(entry, a) and
         packageDependsOn*(entry, b)
@@ -47,7 +47,7 @@ module Redux {
     /** Holds if the two files are considered to be part of the same Redux app. */
     pragma[inline]
     predicate areFilesInSameReduxApp(File a, File b) {
-      not exists(PackageJSON pkg)
+      not exists(PackageJson pkg)
       or
       arePackagesInSameReduxApp(getPackageJson(a), getPackageJson(b))
     }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll b/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll
index ff55e86e219..df761420e29 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll
@@ -82,11 +82,6 @@ module SocketIO {
     }
 
     override DataFlow::SourceNode ref() { result = this.server().getAUse() }
-
-    /**
-     * DEPRECATED. Always returns `this` as a `ServerObject` now represents the origin of a server.
-     */
-    deprecated DataFlow::SourceNode getOrigin() { result = this }
   }
 
   /** A data flow node that may produce (that is, create or return) a socket.io server. */
@@ -523,7 +518,7 @@ module SocketIOClient {
   }
 
   /** Gets the NPM package that contains `nd`. */
-  private NPMPackage getPackage(DataFlow::SourceNode nd) { result.getAFile() = nd.getFile() }
+  private NpmPackage getPackage(DataFlow::SourceNode nd) { result.getAFile() = nd.getFile() }
 
   /**
    * A data flow node representing an API call that receives data from the server.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll b/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll
index acc7ce8cebe..c1e6cb342f1 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll
@@ -84,7 +84,7 @@ module Templating {
     predicate isInCodeAttribute() {
       exists(TopLevel code | code = this.getParent().(HTML::Attribute).getCodeInAttribute() |
         code instanceof EventHandlerCode or
-        code instanceof JavaScriptURL
+        code instanceof JavaScriptUrl
       )
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll b/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll
index fb2d85523d4..d5483cf61e0 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll
@@ -39,12 +39,14 @@ class BDDTest extends Test, @call_expr {
 }
 
 /**
- * Gets the test file for `f` with stem extension `stemExt`.
- * That is, a file named file named `<base>.<stemExt>.<ext>` in the
+ * Gets the test file for `f` with stem extension `stemExt`, where `stemExt` is "test" or "spec".
+ * That is, a file named `<base>.<stemExt>.<ext>` in the
  * same directory as `f` which is named `<base>.<ext>`.
  */
-bindingset[stemExt]
+pragma[noinline]
 File getTestFile(File f, string stemExt) {
+  stemExt = ["test", "spec"] and
+  result.getBaseName().regexpMatch(".*\\.(test|spec)\\..*") and
   result = f.getParentContainer().getFile(f.getStem() + "." + stemExt + "." + f.getExtension())
 }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll b/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll
index ec5a6f996bc..5357259b9eb 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll
@@ -14,10 +14,13 @@ abstract deprecated class UriLibraryStep extends DataFlow::ValueNode {
   predicate step(DataFlow::Node pred, DataFlow::Node succ) { none() }
 }
 
+/** DEPRECATED: Alias for `Urijs` */
+deprecated module urijs = Urijs;
+
 /**
  * Provides classes for working with [urijs](http://medialize.github.io/URI.js/) code.
  */
-module urijs {
+module Urijs {
   /**
    * Gets a data flow source node for the urijs library.
    */
@@ -80,10 +83,13 @@ module urijs {
   }
 }
 
+/** DEPRECATED: Alias for `Uridashjs` */
+deprecated module uridashjs = Uridashjs;
+
 /**
  * Provides classes for working with [uri-js](https://github.com/garycourt/uri-js) code.
  */
-module uridashjs {
+module Uridashjs {
   /**
    * Gets a data flow source node for member `name` of the uridashjs library.
    */
@@ -105,10 +111,13 @@ module uridashjs {
   }
 }
 
+/** DEPRECATED: Alias for `Punycode` */
+deprecated module punycode = Punycode;
+
 /**
  * Provides classes for working with [punycode](https://github.com/bestiejs/punycode.js) code.
  */
-module punycode {
+module Punycode {
   /**
    * Gets a data flow source node for member `name` of the punycode library.
    */
@@ -130,10 +139,13 @@ module punycode {
   }
 }
 
+/** DEPRECATED: Alias for `UrlParse` */
+deprecated module urlParse = UrlParse;
+
 /**
  * Provides classes for working with [url-parse](https://github.com/unshiftio/url-parse) code.
  */
-module urlParse {
+module UrlParse {
   /**
    * Gets a data flow source node for the url-parse library.
    */
@@ -167,10 +179,13 @@ module urlParse {
   }
 }
 
+/** DEPRECATED: Alias for `Querystringify` */
+deprecated module querystringify = Querystringify;
+
 /**
  * Provides classes for working with [querystringify](https://github.com/unshiftio/querystringify) code.
  */
-module querystringify {
+module Querystringify {
   /**
    * Gets a data flow source node for member `name` of the querystringify library.
    */
@@ -197,10 +212,13 @@ module querystringify {
   }
 }
 
+/** DEPRECATED: Alias for `Querydashstring` */
+deprecated module querydashstring = Querydashstring;
+
 /**
  * Provides classes for working with [query-string](https://github.com/sindresorhus/query-string) code.
  */
-module querydashstring {
+module Querydashstring {
   /**
    * Gets a data flow source node for member `name` of the query-string library.
    */
@@ -222,10 +240,13 @@ module querydashstring {
   }
 }
 
+/** DEPRECATED: Alias for `Url` */
+deprecated module url = Url;
+
 /**
  * Provides classes for working with [url](https://nodejs.org/api/url.html) code.
  */
-module url {
+module Url {
   /**
    * Gets a data flow source node for member `name` of the url library.
    */
@@ -245,10 +266,13 @@ module url {
   }
 }
 
+/** DEPRECATED: Alias for `Querystring` */
+deprecated module querystring = Querystring;
+
 /**
  * Provides classes for working with [querystring](https://nodejs.org/api/querystring.html) code.
  */
-module querystring {
+module Querystring {
   /**
    * Gets a data flow source node for member `name` of the querystring library.
    */
@@ -408,7 +432,7 @@ private module ClosureLibraryUri {
   /**
    * Provides classes for working with [path](https://nodejs.org/api/path.html) code.
    */
-  module path {
+  module Path {
     /**
      * A taint step in the path module.
      */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll b/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
index 73b099e5637..1f2d2b90dbf 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
@@ -365,19 +365,19 @@ module Vuex {
    */
   private module ProgramSlicing {
     /** Gets the innermost `package.json` file in a directory containing the given file. */
-    private PackageJSON getPackageJson(Container f) {
+    private PackageJson getPackageJson(Container f) {
       f = result.getFile().getParentContainer()
       or
       not exists(f.getFile("package.json")) and
       result = getPackageJson(f.getParentContainer())
     }
 
-    private predicate packageDependsOn(PackageJSON importer, PackageJSON dependency) {
+    private predicate packageDependsOn(PackageJson importer, PackageJson dependency) {
       importer.getADependenciesObject("").getADependency(dependency.getPackageName(), _)
     }
 
     /** Gets a package that can be considered an entry point for a Vuex app. */
-    private PackageJSON entryPointPackage() {
+    private PackageJson entryPointPackage() {
       result = getPackageJson(storeRef().getAnImmediateUse().getFile())
       or
       // Any package that imports a store-creating package is considered a potential entry point.
@@ -385,8 +385,8 @@ module Vuex {
     }
 
     pragma[nomagic]
-    private predicate arePackagesInSameVuexApp(PackageJSON a, PackageJSON b) {
-      exists(PackageJSON entry |
+    private predicate arePackagesInSameVuexApp(PackageJson a, PackageJson b) {
+      exists(PackageJson entry |
         entry = entryPointPackage() and
         packageDependsOn*(entry, a) and
         packageDependsOn*(entry, b)
@@ -396,7 +396,7 @@ module Vuex {
     /** Holds if the two files are considered to be part of the same Vuex app. */
     pragma[inline]
     predicate areFilesInSameVuexApp(File a, File b) {
-      not exists(PackageJSON pkg)
+      not exists(PackageJson pkg)
       or
       arePackagesInSameVuexApp(getPackageJson(a), getPackageJson(b))
     }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll b/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll
index 36f7df03d92..16e5187081e 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll
@@ -235,19 +235,22 @@ module ServerWebSocket {
   /**
    * The `req` parameter of a `socket.on("connection", (msg, req) => {})` call.
    */
-  class ServerHTTPRequest extends HTTP::Servers::RequestSource {
+  class ServerHttpRequest extends HTTP::Servers::RequestSource {
     ConnectionCallAsRouteHandler handler;
 
-    ServerHTTPRequest() { this = handler.getCallback(1).getParameter(1) }
+    ServerHttpRequest() { this = handler.getCallback(1).getParameter(1) }
 
     override HTTP::RouteHandler getRouteHandler() { result = handler }
   }
 
+  /** DEPRECATED: Alias for ServerHttpRequest */
+  deprecated class ServerHTTPRequest = ServerHttpRequest;
+
   /**
    * An access user-controlled HTTP request input in a request to a WebSocket server.
    */
   class WebSocketRequestInput extends HTTP::RequestInputAccess {
-    ServerHTTPRequest request;
+    ServerHttpRequest request;
     string kind;
 
     WebSocketRequestInput() {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
index c2e5a1808c6..41cecb36941 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
@@ -2,9 +2,9 @@
  * Provides classes for working with XML parser APIs.
  */
 
-private import javascript as js
-private import js::DataFlow as DataFlow
-private import js::API as API
+private import javascript as JS
+private import JS::DataFlow as DataFlow
+private import JS::API as API
 
 module XML {
   /**
@@ -21,9 +21,9 @@ module XML {
   /**
    * A call to an XML parsing function.
    */
-  abstract class ParserInvocation extends js::InvokeExpr {
+  abstract class ParserInvocation extends JS::InvokeExpr {
     /** Gets an argument to this call that is parsed as XML. */
-    abstract js::Expr getSourceArgument();
+    abstract JS::Expr getSourceArgument();
 
     /** Holds if this call to the XML parser resolves entities of the given `kind`. */
     abstract predicate resolvesEntities(EntityKind kind);
@@ -46,14 +46,14 @@ module XML {
       )
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // internal entities are always resolved
       kind = InternalEntity()
       or
       // other entities are only resolved if the configuration option `noent` is set to `true`
-      exists(js::Expr noent |
+      exists(JS::Expr noent |
         hasOptionArgument(1, "noent", noent) and
         noent.mayHaveBooleanValue(true)
       )
@@ -121,7 +121,7 @@ module XML {
       this = parser.getMember("parseString").getACall().asExpr()
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // entities are resolved by default
@@ -144,7 +144,7 @@ module XML {
       this = parser.getMember("push").getACall().asExpr()
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // entities are resolved by default
@@ -167,7 +167,7 @@ module XML {
       this = parser.getMember(["parse", "write"]).getACall().asExpr()
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
       // only internal entities are resolved by default
@@ -182,8 +182,8 @@ module XML {
   /**
    * An invocation of `DOMParser.parseFromString`.
    */
-  private class DOMParserXmlParserInvocation extends XML::ParserInvocation {
-    DOMParserXmlParserInvocation() {
+  private class DomParserXmlParserInvocation extends XML::ParserInvocation {
+    DomParserXmlParserInvocation() {
       this =
         DataFlow::globalVarRef("DOMParser")
             .getAnInstantiation()
@@ -193,7 +193,7 @@ module XML {
       getArgument(1).mayHaveStringValue(any(string tp | tp.matches("%xml%")))
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) { kind = InternalEntity() }
 
@@ -215,7 +215,7 @@ module XML {
       )
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) { any() }
   }
@@ -225,10 +225,10 @@ module XML {
    */
   private class GoogDomXmlParserInvocation extends XML::ParserInvocation {
     GoogDomXmlParserInvocation() {
-      this.getCallee().(js::PropAccess).getQualifiedName() = "goog.dom.xml.loadXml"
+      this.getCallee().(JS::PropAccess).getQualifiedName() = "goog.dom.xml.loadXml"
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) { kind = InternalEntity() }
   }
@@ -246,7 +246,7 @@ module XML {
       )
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) {
       // sax-js (the parser used) does not expand entities.
@@ -273,7 +273,7 @@ module XML {
       this = parser.getAMemberCall("write").asExpr()
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) {
       // sax-js does not expand entities.
@@ -302,7 +302,7 @@ module XML {
             .asExpr()
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) {
       // xml-js does not expand custom entities.
@@ -323,7 +323,7 @@ module XML {
       this = parser.getReturn().getMember("write").getACall().asExpr()
     }
 
-    override js::Expr getSourceArgument() { result = getArgument(0) }
+    override JS::Expr getSourceArgument() { result = getArgument(0) }
 
     override predicate resolvesEntities(XML::EntityKind kind) {
       // htmlparser2 does not expand entities.
@@ -341,7 +341,7 @@ module XML {
     }
   }
 
-  private class XMLParserTaintStep extends js::TaintTracking::SharedTaintStep {
+  private class XmlParserTaintStep extends JS::TaintTracking::SharedTaintStep {
     override predicate deserializeStep(DataFlow::Node pred, DataFlow::Node succ) {
       exists(XML::ParserInvocation parser |
         pred.asExpr() = parser.getSourceArgument() and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
index 5bdfdc0217c..febfa1dc43c 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -13,13 +13,13 @@
  * ```
  */
 
-private import javascript as js
-private import js::DataFlow as DataFlow
+private import javascript as JS
+private import JS::DataFlow as DataFlow
 private import ApiGraphModels
 
-class Unit = js::Unit;
+class Unit = JS::Unit;
 
-module API = js::API;
+module API = JS::API;
 
 import semmle.javascript.frameworks.data.internal.AccessPathSyntax as AccessPathSyntax
 private import AccessPathSyntax
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll b/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll
index 1be8bf0a8a0..28a01dba7ab 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll
@@ -9,18 +9,6 @@ import javascript
  */
 predicate jquery = JQuery::dollar/0;
 
-/**
- * DEPRECATED. In most cases, `JQuery::Object` should be used instead.
- * Alternatively, if used as a base class, and the intent is to extend the model of
- * jQuery objects with more nodes, extend `JQuery::ObjectSource::Range` instead.
- *
- * An expression that may refer to a jQuery object.
- *
- * Note that this class is an over-approximation: `nd instanceof JQueryObject`
- * may hold for nodes `nd` that cannot, in fact, refer to a jQuery object.
- */
-deprecated class JQueryObject = JQueryObjectInternal;
-
 /**
  * An internal version of `JQueryObject` that may be used to retain
  * backwards compatibility without triggering a deprecation warning.
@@ -80,44 +68,6 @@ private predicate neverReturnsJQuery(string name) {
   )
 }
 
-/**
- * DEPRECATED. Use `JQuery::MethodCall` instead.
- *
- * A (possibly chained) call to a jQuery method.
- */
-deprecated class JQueryMethodCall extends CallExpr {
-  string name;
-
-  JQueryMethodCall() { name = this.flow().(JQuery::MethodCall).getMethodName() }
-
-  /**
-   * Gets the name of the jQuery method this call invokes.
-   */
-  string getMethodName() { result = name }
-
-  /**
-   * Holds if `e` is an argument that this method may interpret as HTML.
-   *
-   * Note that some jQuery methods decide whether to interpret an argument
-   * as HTML based on its syntactic shape, so this predicate and
-   * `interpretsArgumentAsSelector` below overlap.
-   */
-  predicate interpretsArgumentAsHtml(Expr e) {
-    this.flow().(JQuery::MethodCall).interpretsArgumentAsHtml(e.flow())
-  }
-
-  /**
-   * Holds if `e` is an argument that this method may interpret as a selector.
-   *
-   * Note that some jQuery methods decide whether to interpret an argument
-   * as a selector based on its syntactic shape, so this predicate and
-   * `interpretsArgumentAsHtml` above overlap.
-   */
-  predicate interpretsArgumentAsSelector(Expr e) {
-    this.flow().(JQuery::MethodCall).interpretsArgumentAsSelector(e.flow())
-  }
-}
-
 /**
  * A call to `jQuery.parseXML`.
  */
@@ -284,10 +234,8 @@ private class JQueryAttr3Call extends JQueryAttributeDefinition, @call_expr {
  * the DOM element constructed by `$("<script/>")`.
  */
 private class JQueryChainedElement extends DOM::Element, InvokeExpr {
-  DOM::Element inner;
-
   JQueryChainedElement() {
-    exists(JQuery::MethodCall call | this = call.asExpr() |
+    exists(JQuery::MethodCall call, DOM::Element inner | this = call.asExpr() |
       call.getReceiver().asExpr() = inner and
       defn = inner.getDefinition()
     )
diff --git a/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll b/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll
index 6585fb7133b..35b1ac83e2d 100644
--- a/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll
+++ b/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll
@@ -26,9 +26,9 @@ private class RemoteFlowPassword extends HeuristicSource, RemoteFlowSource {
  * A use of `JSON.stringify`, viewed as a source for command-line injections
  * since it does not properly escape single quotes and dollar symbols.
  */
-private class JSONStringifyAsCommandInjectionSource extends HeuristicSource,
+private class JsonStringifyAsCommandInjectionSource extends HeuristicSource,
   CommandInjection::Source {
-  JSONStringifyAsCommandInjectionSource() { this instanceof JsonStringifyCall }
+  JsonStringifyAsCommandInjectionSource() { this instanceof JsonStringifyCall }
 
   override string getSourceType() { result = "a string from JSON.stringify" }
 }
diff --git a/javascript/ql/lib/semmle/javascript/heuristics/AdditionalTaintSteps.qll b/javascript/ql/lib/semmle/javascript/heuristics/AdditionalTaintSteps.qll
index a38d938fb40..c0336279b21 100644
--- a/javascript/ql/lib/semmle/javascript/heuristics/AdditionalTaintSteps.qll
+++ b/javascript/ql/lib/semmle/javascript/heuristics/AdditionalTaintSteps.qll
@@ -6,15 +6,6 @@
 
 import javascript
 
-/**
- * DEPRECATED.
- *
- * The target of a heuristic additional flow step in a security query.
- */
-deprecated class HeuristicAdditionalTaintStep extends DataFlow::Node {
-  HeuristicAdditionalTaintStep() { any(TaintTracking::SharedTaintStep step).heuristicStep(_, this) }
-}
-
 /**
  * A call to `tainted.replace(x, y)` that preserves taint.
  */
diff --git a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
index cda0727f136..abd4aa7d823 100644
--- a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
@@ -56,9 +56,9 @@ module Stages {
     predicate backref() {
       1 = 1
       or
-      exists(any(ASTNode a).getTopLevel())
+      exists(any(AstNode a).getTopLevel())
       or
-      exists(any(ASTNode a).getParent())
+      exists(any(AstNode a).getParent())
       or
       exists(any(StmtContainer c).getEnclosingContainer())
       or
@@ -68,7 +68,7 @@ module Stages {
       or
       exists(any(Expr e).getStringValue())
       or
-      any(ASTNode node).isAmbient()
+      any(AstNode node).isAmbient()
       or
       exists(any(Identifier e).getName())
       or
@@ -212,6 +212,8 @@ module Stages {
       any(DataFlow::Node node).hasUnderlyingType(_)
       or
       any(DataFlow::Node node).hasUnderlyingType(_, _)
+      or
+      AccessPath::DominatingPaths::hasDominatingWrite(_)
     }
   }
 
@@ -235,8 +237,6 @@ module Stages {
     predicate backref() {
       1 = 1
       or
-      AccessPath::DominatingPaths::hasDominatingWrite(_)
-      or
       DataFlow::SharedFlowStep::step(_, _)
     }
   }
@@ -245,7 +245,7 @@ module Stages {
    * The `APIStage` stage.
    */
   cached
-  module APIStage {
+  module ApiStage {
     /**
      * Always holds.
      * Ensures that a predicate is evaluated as part of the APIStage stage.
@@ -278,6 +278,9 @@ module Stages {
     }
   }
 
+  /** DEPRECATED: Alias for ApiStage */
+  deprecated module APIStage = ApiStage;
+
   /**
    * The `taint` stage.
    */
diff --git a/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll b/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll
index 70b36e35d83..a1df0504ce8 100644
--- a/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll
@@ -16,7 +16,7 @@ private StmtContainer getStmtContainer(NodeInStmtContainer node) {
   stmt_containers(node, result)
   or
   // Properties
-  exists(ASTNode parent | properties(node, parent, _, _, _) |
+  exists(AstNode parent | properties(node, parent, _, _, _) |
     expr_containers(parent, result)
     or
     stmt_containers(parent, result)
diff --git a/javascript/ql/lib/semmle/javascript/linters/ESLint.qll b/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
index df9a991cf1a..32b9f217a27 100644
--- a/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
+++ b/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
@@ -34,7 +34,7 @@ module ESLint {
   }
 
   /** An ESLint configuration file in JSON format. */
-  abstract private class JsonConfiguration extends Configuration, JSONObject { }
+  abstract private class JsonConfiguration extends Configuration, JsonObject { }
 
   /** An `.eslintrc.json` file. */
   private class EslintrcJson extends JsonConfiguration {
@@ -47,11 +47,11 @@ module ESLint {
   }
 
   /** An ESLint configuration object in JSON format. */
-  private class JsonConfigurationObject extends ConfigurationObject, JSONObject {
+  private class JsonConfigurationObject extends ConfigurationObject, JsonObject {
     override Configuration getConfiguration() { this = result.(JsonConfiguration).getPropValue(_) }
 
     override boolean getBooleanProperty(string p) {
-      exists(string v | v = getPropValue(p).(JSONBoolean).getValue() |
+      exists(string v | v = getPropValue(p).(JsonBoolean).getValue() |
         v = "true" and result = true
         or
         v = "false" and result = false
@@ -86,7 +86,7 @@ module ESLint {
   /** An ESLint configuration embedded in a `package.json` file. */
   private class EslintConfigInPackageJson extends JsonConfiguration {
     EslintConfigInPackageJson() {
-      exists(PackageJSON pkg | this = pkg.getPropValue("eslintConfig"))
+      exists(PackageJson pkg | this = pkg.getPropValue("eslintConfig"))
     }
 
     override ConfigurationObject getGlobals() { result = getPropValue("globals") }
diff --git a/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll b/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll
index 51e294c4f61..e22c00ddc47 100644
--- a/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll
@@ -176,8 +176,8 @@ private module RegexpMatching {
 }
 
 /** A class to test whether a regular expression matches certain HTML tags. */
-class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
-  HTMLMatchingRegExp() {
+class HtmlMatchingRegExp extends RegexpMatching::MatchedRegExp {
+  HtmlMatchingRegExp() {
     // the regexp must mention "<" and ">" explicitly.
     forall(string angleBracket | angleBracket = ["<", ">"] |
       any(RegExpConstant term | term.getValue().matches("%" + angleBracket + "%")).getRootTerm() =
@@ -204,12 +204,15 @@ class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
   }
 }
 
+/** DEPRECATED: Alias for HtmlMatchingRegExp */
+deprecated class HTMLMatchingRegExp = HtmlMatchingRegExp;
+
 /**
  * Holds if `regexp` matches some HTML tags, but misses some HTML tags that it should match.
  *
  * When adding a new case to this predicate, make sure the test string used in `matches(..)` calls are present in `HTMLMatchingRegExp::test` / `HTMLMatchingRegExp::testWithGroups`.
  */
-predicate isBadRegexpFilter(HTMLMatchingRegExp regexp, string msg) {
+predicate isBadRegexpFilter(HtmlMatchingRegExp regexp, string msg) {
   // CVE-2021-33829 - matching both "<!-- foo -->" and "<!-- foo --!>", but in different capture groups
   regexp.matches("<!-- foo -->") and
   regexp.matches("<!-- foo --!>") and
diff --git a/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll b/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll
index a0cbfdef293..5de56e762a2 100644
--- a/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll
+++ b/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll
@@ -121,39 +121,37 @@ module HtmlSanitization {
   /**
    * An incomplete sanitizer for HTML-relevant characters.
    */
-  class IncompleteSanitizer extends IncompleteBlacklistSanitizer {
-    StringReplaceCallSequence chain;
+  class IncompleteSanitizer extends IncompleteBlacklistSanitizer instanceof StringReplaceCallSequence {
     string unsanitized;
 
     IncompleteSanitizer() {
-      this = chain and
-      fixedGlobalReplacement(chain) and
-      not getALikelyReplacedCharacter(chain) = unsanitized and
+      fixedGlobalReplacement(this) and
+      not getALikelyReplacedCharacter(this) = unsanitized and
       (
         // replaces `<` and `>`
-        getALikelyReplacedCharacter(chain) = "<" and
-        getALikelyReplacedCharacter(chain) = ">" and
+        getALikelyReplacedCharacter(this) = "<" and
+        getALikelyReplacedCharacter(this) = ">" and
         unsanitized = ["\"", "'", "&"]
         or
         // replaces '&' and either `<` or `>`
-        getALikelyReplacedCharacter(chain) = "&" and
+        getALikelyReplacedCharacter(this) = "&" and
         (
-          getALikelyReplacedCharacter(chain) = ">" and
+          getALikelyReplacedCharacter(this) = ">" and
           unsanitized = ">"
           or
-          getALikelyReplacedCharacter(chain) = "<" and
+          getALikelyReplacedCharacter(this) = "<" and
           unsanitized = "<"
         )
       ) and
       // does not replace special characters that the browser doesn't care for
-      not chain.getAReplacedString() = ["!", "#", "*", "?", "@", "|", "~"] and
+      not super.getAReplacedString() = ["!", "#", "*", "?", "@", "|", "~"] and
       /// only replaces explicit characters: exclude character ranges and negated character classes
-      not exists(RegExpTerm t | t = chain.getAMember().getRegExp().getRoot().getAChild*() |
+      not exists(RegExpTerm t | t = super.getAMember().getRegExp().getRoot().getAChild*() |
         t.(RegExpCharacterClass).isInverted() or
         t instanceof RegExpCharacterRange
       ) and
       // the replacements are either empty or HTML entities
-      chain.getAReplacementString().regexpMatch("(?i)(|(&[#a-z0-9]+;))")
+      super.getAReplacementString().regexpMatch("(?i)(|(&[#a-z0-9]+;))")
     }
 
     override string getKind() { result = "HTML" }
diff --git a/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll b/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll
index 848f924a846..e31b482c25f 100644
--- a/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll
@@ -16,9 +16,9 @@ import semmle.javascript.security.SensitiveActions
  */
 predicate config(string key, string val, Locatable valElement) {
   (
-    exists(JSONObject obj | not exists(PackageJSON p | obj = p.getADependenciesObject(_)) |
+    exists(JsonObject obj | not exists(PackageJson p | obj = p.getADependenciesObject(_)) |
       obj.getPropValue(key) = valElement and
-      val = valElement.(JSONString).getValue()
+      val = valElement.(JsonString).getValue()
     )
     or
     exists(YAMLMapping m, YAMLString keyElement |
diff --git a/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll b/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
index fcea4ffbbfd..a9e0fd35bfb 100644
--- a/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
+++ b/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
@@ -226,19 +226,19 @@ module PasswordHeuristics {
   predicate isDummyAuthHeader(string header) {
     isDummyPassword(header)
     or
-    exists(string prefix, string suffix | prefix = getAnHTTPAuthenticationScheme() |
+    exists(string prefix, string suffix | prefix = getAnHttpAuthenticationScheme() |
       header.toLowerCase() = prefix + " " + suffix and
       isDummyPassword(suffix)
     )
     or
-    header.trim().toLowerCase() = getAnHTTPAuthenticationScheme()
+    header.trim().toLowerCase() = getAnHttpAuthenticationScheme()
   }
 
   /**
    * Gets a HTTP authentication scheme normalized to lowercase.
    * From this list: https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml
    */
-  private string getAnHTTPAuthenticationScheme() {
+  private string getAnHttpAuthenticationScheme() {
     result =
       [
         "Basic", "Bearer", "Digest", "HOBA", "Mutual", "Negotiate", "OAuth", "SCRAM-SHA-1",
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
index 76b64b3e944..f7fc0f86267 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
@@ -186,9 +186,9 @@ module ClientSideUrlRedirect {
    */
   class ReactAttributeWriteUrlSink extends ScriptUrlSink {
     ReactAttributeWriteUrlSink() {
-      exists(JSXAttribute attr |
+      exists(JsxAttribute attr |
         attr.getName() = DOM::getAPropertyNameInterpretedAsJavaScriptUrl() and
-        attr.getElement().isHTMLElement()
+        attr.getElement().isHtmlElement()
         or
         DataFlow::moduleImport("next/link").flowsToExpr(attr.getElement().getNameExpr())
       |
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
index 66321456266..19ecc84bcde 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
@@ -208,7 +208,7 @@ module CodeInjection {
    */
   class ReactScriptTag extends Sink {
     ReactScriptTag() {
-      exists(JSXElement element | element.getName() = "script" |
+      exists(JsxElement element | element.getName() = "script" |
         this = element.getBodyElement(_).flow()
       )
     }
@@ -223,7 +223,7 @@ module CodeInjection {
         def.getName().regexpMatch("(?i)on.+") and
         this = def.getValueNode() and
         // JSX event handlers are functions, not strings
-        not def instanceof JSXAttribute
+        not def instanceof JsxAttribute
       )
     }
   }
@@ -231,10 +231,13 @@ module CodeInjection {
   /**
    * A code operator of a NoSQL query as a code injection sink.
    */
-  class NoSQLCodeInjectionSink extends Sink {
-    NoSQLCodeInjectionSink() { any(NoSQL::Query q).getACodeOperator() = this }
+  class NoSqlCodeInjectionSink extends Sink {
+    NoSqlCodeInjectionSink() { any(NoSql::Query q).getACodeOperator() = this }
   }
 
+  /** DEPRECATED: Alias for NoSqlCodeInjectionSink */
+  deprecated class NoSQLCodeInjectionSink = NoSqlCodeInjectionSink;
+
   /**
    * The first argument to `Module.prototype._compile`, considered as a code-injection sink.
    */
@@ -379,5 +382,8 @@ module CodeInjection {
   /**
    * A call to JSON.stringify() seen as a sanitizer.
    */
-  class JSONStringifySanitizer extends Sanitizer, JsonStringifyCall { }
+  class JsonStringifySanitizer extends Sanitizer, JsonStringifyCall { }
+
+  /** DEPRECATED: Alias for JsonStringifySanitizer */
+  deprecated class JSONStringifySanitizer = JsonStringifySanitizer;
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
index dd88867f4f0..459e7a45d4a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
@@ -10,14 +10,17 @@ predicate isDomRootType(ExternalType tp) {
 }
 
 /** A global variable whose declared type extends a DOM root type. */
-class DOMGlobalVariable extends GlobalVariable {
-  DOMGlobalVariable() {
+class DomGlobalVariable extends GlobalVariable {
+  DomGlobalVariable() {
     exists(ExternalVarDecl d | d.getQualifiedName() = this.getName() |
       isDomRootType(d.getTypeTag().getTypeDeclaration().getASupertype*())
     )
   }
 }
 
+/** DEPRECATED: Alias for DomGlobalVariable */
+deprecated class DOMGlobalVariable = DomGlobalVariable;
+
 /** Holds if `e` could hold a value that comes from the DOM. */
 predicate isDomValue(Expr e) { DOM::domValueRef().flowsToExpr(e) }
 
@@ -29,15 +32,25 @@ predicate isLocation(Expr e) {
 }
 
 /**
+ * DEPRECATED: Use DOM::documentRef() instead.
  * Gets a reference to the 'document' object.
  */
-DataFlow::SourceNode document() { result = DOM::documentRef() }
+deprecated DataFlow::SourceNode document() { result = DOM::documentRef() }
 
-/** Holds if `e` could refer to the `document` object. */
-predicate isDocument(Expr e) { DOM::documentRef().flowsToExpr(e) }
+/**
+ * DEPRECATED: Use DOM::documentRef() instead.
+ * Holds if `e` could refer to the `document` object.
+ */
+deprecated predicate isDocument(Expr e) { DOM::documentRef().flowsToExpr(e) }
 
-/** Holds if `e` could refer to the document URL. */
-predicate isDocumentURL(Expr e) { e.flow() = DOM::locationSource() }
+/**
+ * DEPRECATED: Use DOM::locationSource() instead.
+ * Holds if `e` could refer to the document URL.
+ */
+deprecated predicate isDocumentUrl(Expr e) { e.flow() = DOM::locationSource() }
+
+/** DEPRECATED: Alias for isDocumentUrl */
+deprecated predicate isDocumentURL = isDocumentUrl/1;
 
 /**
  * DEPRECATED. In most cases, a sanitizer based on this predicate can be removed, as
@@ -62,7 +75,7 @@ class DomMethodCallExpr extends MethodCallExpr {
   /**
    * Holds if `arg` is an argument that is interpreted as HTML.
    */
-  predicate interpretsArgumentsAsHTML(Expr arg) {
+  predicate interpretsArgumentsAsHtml(Expr arg) {
     exists(int argPos, string name |
       arg = this.getArgument(argPos) and
       name = this.getMethodName()
@@ -93,6 +106,9 @@ class DomMethodCallExpr extends MethodCallExpr {
       )
     )
   }
+
+  /** DEPRECATED: Alias for interpretsArgumentsAsHtml */
+  deprecated predicate interpretsArgumentsAsHTML(Expr arg) { this.interpretsArgumentsAsHtml(arg) }
 }
 
 /**
@@ -109,11 +125,14 @@ class DomPropWriteNode extends Assignment {
   /**
    * Holds if the assigned value is interpreted as HTML.
    */
-  predicate interpretsValueAsHTML() {
+  predicate interpretsValueAsHtml() {
     lhs.getPropertyName() = "innerHTML" or
     lhs.getPropertyName() = "outerHTML"
   }
 
+  /** DEPRECATED: Alias for interpretsValueAsHtml */
+  deprecated predicate interpretsValueAsHTML() { this.interpretsValueAsHtml() }
+
   /**
    * Holds if the assigned value is interpreted as JavaScript via javascript: protocol.
    */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionQuery.qll
index 4f693a193dc..918ef0663c8 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DeepObjectResourceExhaustionQuery.qll
@@ -26,6 +26,11 @@ class Configuration extends TaintTracking::Configuration {
     guard instanceof TaintedObject::SanitizerGuard
   }
 
+  override predicate isSanitizer(DataFlow::Node node) {
+    super.isSanitizer(node) or
+    node instanceof Sanitizer
+  }
+
   override predicate isAdditionalFlowStep(
     DataFlow::Node src, DataFlow::Node trg, DataFlow::FlowLabel inlbl, DataFlow::FlowLabel outlbl
   ) {
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll
index 801accf4f11..e1239bff5f5 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll
@@ -4,4 +4,7 @@ import javascript
 private import ExternalAPIUsedWithUntrustedDataQuery as ExternalAPIUsedWithUntrustedDataQuery // ignore-query-import
 
 /** DEPRECATED. Import `ExternalAPIUsedWithUntrustedDataQuery` instead. */
-deprecated module ExternalAPIUsedWithUntrustedData = ExternalAPIUsedWithUntrustedDataQuery;
+deprecated module ExternalApiUsedWithUntrustedData = ExternalAPIUsedWithUntrustedDataQuery;
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated module ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
index c2a3736e778..81fd7b89118 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
@@ -9,7 +9,7 @@ import javascript
  * Provides sources, sinks and sanitizers for reasoning about flow of
  * untrusted data into an external API.
  */
-module ExternalAPIUsedWithUntrustedData {
+module ExternalApiUsedWithUntrustedData {
   /**
    * A source of untrusted data.
    */
@@ -62,12 +62,15 @@ module ExternalAPIUsedWithUntrustedData {
   /**
    * A package name whose entire API is considered "safe" for the purpose of this query.
    */
-  abstract class SafeExternalAPIPackage extends string {
-    SafeExternalAPIPackage() { exists(API::moduleImport(this)) }
+  abstract class SafeExternalApiPackage extends string {
+    SafeExternalApiPackage() { exists(API::moduleImport(this)) }
   }
 
-  private class DefaultSafeExternalAPIPackage extends SafeExternalAPIPackage {
-    DefaultSafeExternalAPIPackage() {
+  /** DEPRECATED: Alias for SafeExternalApiPackage */
+  deprecated class SafeExternalAPIPackage = SafeExternalApiPackage;
+
+  private class DefaultSafeExternalApiPackage extends SafeExternalApiPackage {
+    DefaultSafeExternalApiPackage() {
       // Promise libraries are safe and generate too much noise if included
       this =
         [
@@ -80,14 +83,17 @@ module ExternalAPIUsedWithUntrustedData {
   /**
    * A function that is considered a "safe" external API from a security perspective.
    */
-  abstract class SafeExternalAPIFunction extends API::Node { }
+  abstract class SafeExternalApiFunction extends API::Node { }
+
+  /** DEPRECATED: Alias for SafeExternalApiFunction */
+  deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
 
   /** Holds if data read from a use of `f` may originate from an imported package. */
   private predicate mayComeFromLibrary(API::Node f) {
     // base case: import
     exists(string path |
       f = API::moduleImport(path) and
-      not path instanceof SafeExternalAPIPackage and
+      not path instanceof SafeExternalApiPackage and
       // Exclude paths that can be resolved to a file in the project
       not exists(Import imprt |
         imprt.getImportedPath().getValue() = path and exists(imprt.getImportedModule())
@@ -132,10 +138,10 @@ module ExternalAPIUsedWithUntrustedData {
    */
   private predicate nodeIsRelevant(API::Node node) {
     mayComeFromLibrary(node) and
-    not node instanceof SafeExternalAPIFunction
+    not node instanceof SafeExternalApiFunction
     or
     nodeIsRelevant(node.getASuccessor()) and
-    not node = API::moduleImport(any(SafeExternalAPIPackage p))
+    not node = API::moduleImport(any(SafeExternalApiPackage p))
   }
 
   /** Holds if the edge `pred -> succ` may lead to an external API call. */
@@ -368,3 +374,6 @@ module ExternalAPIUsedWithUntrustedData {
     }
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated module ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll
index d9675c05997..99136f17bda 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll
@@ -8,7 +8,7 @@
  */
 
 import javascript
-import ExternalAPIUsedWithUntrustedDataCustomizations::ExternalAPIUsedWithUntrustedData
+import ExternalAPIUsedWithUntrustedDataCustomizations::ExternalApiUsedWithUntrustedData
 
 /** Flow label for objects from which a tainted value is reachable. */
 private class ObjectWrapperFlowLabel extends DataFlow::FlowLabel {
@@ -59,18 +59,24 @@ class Configuration extends TaintTracking::Configuration {
 }
 
 /** A node representing data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
-  ExternalAPIDataNode() { this instanceof Sink }
+class ExternalApiDataNode extends DataFlow::Node {
+  ExternalApiDataNode() { this instanceof Sink }
 }
 
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(Configuration c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(Configuration c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() { any(Configuration c).hasFlow(result, this) }
 }
 
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
 /**
  * Name of an external API sink, boxed in a newtype for consistency with other languages.
  */
@@ -83,9 +89,9 @@ private newtype TExternalApi =
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalApi {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
     this = MkExternalApiNode(result.(Sink).getApiName())
   }
 
@@ -97,3 +103,6 @@ class ExternalAPIUsedWithUntrustedData extends TExternalApi {
   /** Gets a textual representation of this element. */
   string toString() { this = MkExternalApiNode(result) }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsQuery.qll
index 2b84c54e5e1..b38d1908faf 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsQuery.qll
@@ -19,6 +19,11 @@ class Configuration extends DataFlow::Configuration {
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
+  override predicate isBarrier(DataFlow::Node node) {
+    super.isBarrier(node) or
+    node instanceof Sanitizer
+  }
+
   override predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node trg) {
     exists(Base64::Encode encode | src = encode.getInput() and trg = encode.getOutput())
     or
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll
index 16ec41d3489..7d28942e05b 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll
@@ -23,11 +23,6 @@ module HttpToFileAccess {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for writing user-controlled data to files. */
-  deprecated class RemoteFlowSourceAsSource extends DataFlow::Node {
-    RemoteFlowSourceAsSource() { this instanceof RemoteFlowSource }
-  }
-
   /**
    * An access to a user-controlled HTTP request input, considered as a flow source for writing user-controlled data to files
    */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll
index 7fc2cfc2a83..fc08feeb162 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll
@@ -35,10 +35,13 @@ module ImproperCodeSanitization {
   /**
    * A call to `JSON.stringify()` seen as a source for improper code sanitization
    */
-  class JSONStringifyAsSource extends Source {
-    JSONStringifyAsSource() { this instanceof JsonStringifyCall }
+  class JsonStringifyAsSource extends Source {
+    JsonStringifyAsSource() { this instanceof JsonStringifyCall }
   }
 
+  /** DEPRECATED: Alias for JsonStringifyAsSource */
+  deprecated class JSONStringifyAsSource = JsonStringifyAsSource;
+
   /**
    * A leaf in a string-concatenation, where the string-concatenation constructs code that looks like a function.
    */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll
index 46a76d656af..0a34642ffd8 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll
@@ -47,16 +47,22 @@ module InsecureDownload {
     /**
      * A flow-label for file URLs that are both sensitive and downloaded over an insecure connection.
      */
-    class SensitiveInsecureURL extends DataFlow::FlowLabel {
-      SensitiveInsecureURL() { this = "sensitiveInsecure" }
+    class SensitiveInsecureUrl extends DataFlow::FlowLabel {
+      SensitiveInsecureUrl() { this = "sensitiveInsecure" }
     }
 
+    /** DEPRECATED: Alias for SensitiveInsecureUrl */
+    deprecated class SensitiveInsecureURL = SensitiveInsecureUrl;
+
     /**
      * A flow-label for a URL that is downloaded over an insecure connection.
      */
-    class InsecureURL extends DataFlow::FlowLabel {
-      InsecureURL() { this = "insecure" }
+    class InsecureUrl extends DataFlow::FlowLabel {
+      InsecureUrl() { this = "insecure" }
     }
+
+    /** DEPRECATED: Alias for InsecureUrl */
+    deprecated class InsecureURL = InsecureUrl;
   }
 
   /**
@@ -72,10 +78,10 @@ module InsecureDownload {
     }
 
     override DataFlow::FlowLabel getALabel() {
-      result instanceof Label::InsecureURL
+      result instanceof Label::InsecureUrl
       or
       hasUnsafeExtension(str) and
-      result instanceof Label::SensitiveInsecureURL
+      result instanceof Label::SensitiveInsecureUrl
     }
   }
 
@@ -106,21 +112,24 @@ module InsecureDownload {
    * A url downloaded by a client-request, seen as a sink for download of
    * sensitive file through insecure connection.
    */
-  class ClientRequestURL extends Sink {
+  class ClientRequestUrl extends Sink {
     ClientRequest request;
 
-    ClientRequestURL() { this = request.getUrl() }
+    ClientRequestUrl() { this = request.getUrl() }
 
     override DataFlow::Node getDownloadCall() { result = request }
 
     override DataFlow::FlowLabel getALabel() {
-      result instanceof Label::SensitiveInsecureURL
+      result instanceof Label::SensitiveInsecureUrl
       or
       hasUnsafeExtension(request.getASavePath().getStringValue()) and
-      result instanceof Label::InsecureURL
+      result instanceof Label::InsecureUrl
     }
   }
 
+  /** DEPRECATED: Alias for ClientRequestUrl */
+  deprecated class ClientRequestURL = ClientRequestUrl;
+
   /**
    * Gets a node for the response from `request`, type-tracked using `t`.
    */
@@ -136,15 +145,16 @@ module InsecureDownload {
    */
   class FileWriteSink extends Sink {
     ClientRequest request;
-    FileSystemWriteAccess write;
 
     FileWriteSink() {
-      this = request.getUrl() and
-      clientRequestResponse(DataFlow::TypeTracker::end(), request).flowsTo(write.getADataNode()) and
-      hasUnsafeExtension(write.getAPathArgument().getStringValue())
+      exists(FileSystemWriteAccess write |
+        this = request.getUrl() and
+        clientRequestResponse(DataFlow::TypeTracker::end(), request).flowsTo(write.getADataNode()) and
+        hasUnsafeExtension(write.getAPathArgument().getStringValue())
+      )
     }
 
-    override DataFlow::FlowLabel getALabel() { result instanceof Label::InsecureURL }
+    override DataFlow::FlowLabel getALabel() { result instanceof Label::InsecureUrl }
 
     override DataFlow::Node getDownloadCall() { result = request }
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll
index d61c2f6a626..8b7eb42dd25 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll
@@ -9,15 +9,6 @@
 import javascript
 import InsecureDownloadCustomizations::InsecureDownload
 
-// Materialize flow labels
-private class ConcreteSensitiveInsecureURL extends Label::SensitiveInsecureURL {
-  ConcreteSensitiveInsecureURL() { this = this }
-}
-
-private class ConcreteInsecureURL extends Label::InsecureURL {
-  ConcreteInsecureURL() { this = this }
-}
-
 /**
  * A taint tracking configuration for download of sensitive file through insecure connection.
  */
@@ -31,4 +22,9 @@ class Configuration extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink, DataFlow::FlowLabel label) {
     sink.(Sink).getALabel() = label
   }
+
+  override predicate isBarrier(DataFlow::Node node) {
+    super.isBarrier(node) or
+    node instanceof Sanitizer
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/LoopBoundInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/LoopBoundInjectionCustomizations.qll
index 9a44bf2d41f..2142d468b90 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/LoopBoundInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/LoopBoundInjectionCustomizations.qll
@@ -134,10 +134,8 @@ module LoopBoundInjection {
    * such as `_.filter(sink, ...)`.
    */
   private class LodashIterationSink extends Sink {
-    DataFlow::CallNode call;
-
     LodashIterationSink() {
-      exists(string name |
+      exists(string name, DataFlow::CallNode call |
         loopableLodashMethod(name) and
         call = LodashUnderscore::member(name).getACall() and
         call.getArgument(0) = this and
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
index 6de40123339..7d4c5939440 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
@@ -30,13 +30,13 @@ module NosqlInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for NoSQL injection. */
+  /** A source of remote user input, considered as a flow source for NoSql injection. */
   class RemoteFlowSourceAsSource extends Source {
     RemoteFlowSourceAsSource() { this instanceof RemoteFlowSource }
   }
 
-  /** An expression interpreted as a NoSQL query, viewed as a sink. */
+  /** An expression interpreted as a NoSql query, viewed as a sink. */
   class NosqlQuerySink extends Sink, DataFlow::ValueNode {
-    override NoSQL::Query astNode;
+    override NoSql::Query astNode;
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll
index 0da389208f2..ada9c57ad64 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll
@@ -44,7 +44,7 @@ class Configuration extends TaintTracking::Configuration {
     // additional flow step to track taint through NoSQL query objects
     inlbl = TaintedObject::label() and
     outlbl = TaintedObject::label() and
-    exists(NoSQL::Query query, DataFlow::SourceNode queryObj |
+    exists(NoSql::Query query, DataFlow::SourceNode queryObj |
       queryObj.flowsToExpr(query) and
       queryObj.flowsTo(trg) and
       src = queryObj.getAPropertyWrite().getRhs()
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutionCustomizations.qll
index 8a4726030a1..162246dcf23 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutionCustomizations.qll
@@ -53,11 +53,6 @@ module PrototypePollution {
      */
     abstract DataFlow::FlowLabel getAFlowLabel();
 
-    /**
-     * DEPRECATED. Override `dependencyInfo` instead.
-     */
-    deprecated Dependency getDependency() { none() }
-
     /**
      * Holds if `moduleName` is the name of the module that defines this sink,
      * and `location` is the declaration of that dependency.
@@ -89,21 +84,22 @@ module PrototypePollution {
   }
 
   class DeepExtendSink extends Sink {
-    ExtendCall call;
     string moduleName;
     Locatable location;
 
     DeepExtendSink() {
-      this = call.getASourceOperand() and
-      (
-        exists(Dependency dep |
-          isVulnerableVersionOfDeepExtendCall(call, dep) and
-          dep = location and
-          dep.info(moduleName, _)
+      exists(ExtendCall call |
+        this = call.getASourceOperand() and
+        (
+          exists(Dependency dep |
+            isVulnerableVersionOfDeepExtendCall(call, dep) and
+            dep = location and
+            dep.info(moduleName, _)
+          )
+          or
+          isVulnerableDeepExtendCallAllVersions(call, moduleName) and
+          location = call.asExpr()
         )
-        or
-        isVulnerableDeepExtendCallAllVersions(call, moduleName) and
-        location = call.asExpr()
       )
     }
 
@@ -119,11 +115,6 @@ module PrototypePollution {
     }
   }
 
-  /**
-   * DEPRECATED. Use `isVulnerableVersionOfDeepExtendCall` or `isVulnerableDeepExtendCallAllVersions` instead.
-   */
-  deprecated predicate isVulnerableDeepExtendCall = isVulnerableVersionOfDeepExtendCall/2;
-
   /**
    * Holds if `call` is vulnerable to prototype pollution because the callee is defined by `dep`.
    */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
index 6aaa4f4ae2b..ff026f3a3a4 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
@@ -101,11 +101,11 @@ class ClientSideRemoteFlowKind extends string {
  * `name` and `address` of global variable `user` should be considered as remote flow sources with
  * source type "user input".
  */
-private class RemoteFlowSourceAccessPath extends JSONString {
+private class RemoteFlowSourceAccessPath extends JsonString {
   string sourceType;
 
   RemoteFlowSourceAccessPath() {
-    exists(JSONObject specs |
+    exists(JsonObject specs |
       specs.isTopLevel() and
       this.getFile().getBaseName() = "codeql-javascript-remote-flow-sources.json" and
       this = specs.getPropValue(sourceType).getElementValue(_) and
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll
index c660657a322..66cec4dbec8 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll
@@ -139,26 +139,32 @@ module UnsafeHtmlConstruction {
   /**
    * A string-concatenation of HTML, where the result is used as an XSS sink.
    */
-  class HTMLConcatenationSink extends XssSink, StringOps::HtmlConcatenationLeaf {
-    HTMLConcatenationSink() { isUsedInXssSink(xssSink) = this.getRoot() }
+  class HtmlConcatenationSink extends XssSink, StringOps::HtmlConcatenationLeaf {
+    HtmlConcatenationSink() { isUsedInXssSink(xssSink) = this.getRoot() }
 
     override string describe() { result = "HTML construction" }
   }
 
+  /** DEPRECATED: Alias for HtmlConcatenationSink */
+  deprecated class HTMLConcatenationSink = HtmlConcatenationSink;
+
   /**
    * A string parsed as XML, which is later used in an XSS sink.
    */
-  class XMLParsedSink extends XssSink {
-    XML::ParserInvocation parser;
-
-    XMLParsedSink() {
-      this.asExpr() = parser.getSourceArgument() and
-      isUsedInXssSink(xssSink) = parser.getAResult()
+  class XmlParsedSink extends XssSink {
+    XmlParsedSink() {
+      exists(XML::ParserInvocation parser |
+        this.asExpr() = parser.getSourceArgument() and
+        isUsedInXssSink(xssSink) = parser.getAResult()
+      )
     }
 
     override string describe() { result = "XML parsing" }
   }
 
+  /** DEPRECATED: Alias for XmlParsedSink */
+  deprecated class XMLParsedSink = XmlParsedSink;
+
   /**
    * A string rendered as markdown, where the rendering preserves HTML.
    */
@@ -166,7 +172,7 @@ module UnsafeHtmlConstruction {
     MarkdownSink() {
       exists(DataFlow::Node pred, DataFlow::Node succ, Markdown::MarkdownStep step |
         step.step(pred, succ) and
-        step.preservesHTML() and
+        step.preservesHtml() and
         this = pred and
         succ = isUsedInXssSink(xssSink)
       )
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll
index e359a86e163..9ee49be3857 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll
@@ -199,7 +199,7 @@ module UnsafeJQueryPlugin {
       DataFlow::PropRead finalRead
     |
       hasDefaultOption(plugin, defaultDef) and
-      defaultDef = getALikelyHTMLWrite(finalRead.getPropertyName()) and
+      defaultDef = getALikelyHtmlWrite(finalRead.getPropertyName()) and
       finalRead.flowsTo(sink) and
       sink.getTopLevel() = plugin.getTopLevel()
     )
@@ -209,7 +209,7 @@ module UnsafeJQueryPlugin {
    * Gets a property-write that writes a HTML-like constant string to `prop`.
    */
   pragma[noinline]
-  private DataFlow::PropWrite getALikelyHTMLWrite(string prop) {
+  private DataFlow::PropWrite getALikelyHtmlWrite(string prop) {
     exists(string default |
       result.getRhs().mayHaveStringValue(default) and
       default.regexpMatch("\\s*<.*") and
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
index eb3d45c539d..2e0d284768b 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
@@ -109,19 +109,20 @@ module UnsafeShellCommandConstruction {
    * An element pushed to an array, where the array is later used to execute a shell command.
    */
   class ArrayAppendEndingInCommandExecutinSink extends Sink {
-    DataFlow::SourceNode array;
     SystemCommandExecution sys;
 
     ArrayAppendEndingInCommandExecutinSink() {
-      this =
-        [
-          array.(DataFlow::ArrayCreationNode).getAnElement(),
-          array.getAMethodCall(["push", "unshift"]).getAnArgument()
-        ] and
-      exists(DataFlow::MethodCallNode joinCall | array.getAMethodCall("join") = joinCall |
-        joinCall = isExecutedAsShellCommand(DataFlow::TypeBackTracker::end(), sys) and
-        joinCall.getNumArgument() = 1 and
-        joinCall.getArgument(0).getStringValue() = " "
+      exists(DataFlow::SourceNode array |
+        this =
+          [
+            array.(DataFlow::ArrayCreationNode).getAnElement(),
+            array.getAMethodCall(["push", "unshift"]).getAnArgument()
+          ] and
+        exists(DataFlow::MethodCallNode joinCall | array.getAMethodCall("join") = joinCall |
+          joinCall = isExecutedAsShellCommand(DataFlow::TypeBackTracker::end(), sys) and
+          joinCall.getNumArgument() = 1 and
+          joinCall.getArgument(0).getStringValue() = " "
+        )
       )
     }
 
@@ -136,14 +137,15 @@ module UnsafeShellCommandConstruction {
    * A formatted string that is later executed as a shell command.
    */
   class FormatedStringInCommandExecutionSink extends Sink {
-    PrintfStyleCall call;
     SystemCommandExecution sys;
 
     FormatedStringInCommandExecutionSink() {
-      this = call.getFormatArgument(_) and
-      call = isExecutedAsShellCommand(DataFlow::TypeBackTracker::end(), sys) and
-      exists(string formatString | call.getFormatString().mayHaveStringValue(formatString) |
-        formatString.regexpMatch(".* ('|\")?[0-9a-zA-Z/:_-]*%.*")
+      exists(PrintfStyleCall call |
+        this = call.getFormatArgument(_) and
+        call = isExecutedAsShellCommand(DataFlow::TypeBackTracker::end(), sys) and
+        exists(string formatString | call.getFormatString().mayHaveStringValue(formatString) |
+          formatString.regexpMatch(".* ('|\")?[0-9a-zA-Z/:_-]*%.*")
+        )
       )
     }
 
@@ -206,13 +208,14 @@ module UnsafeShellCommandConstruction {
    * Joining a path is similar to string concatenation that automatically inserts slashes.
    */
   class JoinedPathEndingInCommandExecutionSink extends Sink {
-    DataFlow::MethodCallNode joinCall;
     SystemCommandExecution sys;
 
     JoinedPathEndingInCommandExecutionSink() {
-      this = joinCall.getAnArgument() and
-      joinCall = DataFlow::moduleMember("path", ["resolve", "join"]).getACall() and
-      joinCall = isExecutedAsShellCommand(DataFlow::TypeBackTracker::end(), sys)
+      exists(DataFlow::MethodCallNode joinCall |
+        this = joinCall.getAnArgument() and
+        joinCall = DataFlow::moduleMember("path", ["resolve", "join"]).getACall() and
+        joinCall = isExecutedAsShellCommand(DataFlow::TypeBackTracker::end(), sys)
+      )
     }
 
     override string getSinkType() { result = "Path concatenation" }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll
index ad1acdce45d..2353cf68c50 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallCustomizations.qll
@@ -34,6 +34,8 @@ module UnvalidatedDynamicMethodCall {
 
   /**
    * A sanitizer for unvalidated dynamic method calls.
+   * Override the `sanitizes` predicate to specify an edge that should be sanitized.
+   * The `this` value is not seen as a sanitizer.
    */
   abstract class Sanitizer extends DataFlow::Node {
     abstract predicate sanitizes(DataFlow::Node source, DataFlow::Node sink, DataFlow::FlowLabel lbl);
@@ -73,12 +75,12 @@ module UnvalidatedDynamicMethodCall {
    * A function invocation of an unsafe function, as a sink for remote unvalidated dynamic method calls.
    */
   class CalleeAsSink extends Sink {
-    InvokeExpr invk;
-
     CalleeAsSink() {
-      this = invk.getCallee().flow() and
-      // don't flag invocations inside a try-catch
-      not invk.getASuccessor() instanceof CatchClause
+      exists(InvokeExpr invk |
+        this = invk.getCallee().flow() and
+        // don't flag invocations inside a try-catch
+        not invk.getASuccessor() instanceof CatchClause
+      )
     }
 
     override DataFlow::FlowLabel getFlowLabel() {
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallQuery.qll
index 0733465fd62..7a0b6594194 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnvalidatedDynamicMethodCallQuery.qll
@@ -38,7 +38,11 @@ class Configuration extends TaintTracking::Configuration {
     sink.(Sink).getFlowLabel() = label
   }
 
-  override predicate isSanitizer(DataFlow::Node nd) { super.isSanitizer(nd) }
+  override predicate isSanitizerEdge(
+    DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel lbl
+  ) {
+    any(Sanitizer s).sanitizes(pred, succ, lbl)
+  }
 
   override predicate isSanitizerGuard(TaintTracking::SanitizerGuardNode guard) {
     guard instanceof NumberGuard or
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
index 501eed347c5..0fd9dfff96a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
@@ -88,8 +88,8 @@ module Shared {
    * A sanitizer guard that checks for the existence of HTML chars in a string.
    * E.g. `/["'&<>]/.exec(str)`.
    */
-  class ContainsHTMLGuard extends SanitizerGuard, StringOps::RegExpTest {
-    ContainsHTMLGuard() {
+  class ContainsHtmlGuard extends SanitizerGuard, StringOps::RegExpTest {
+    ContainsHtmlGuard() {
       exists(RegExpCharacterClass regExp |
         regExp = this.getRegExp() and
         forall(string s | s = ["\"", "&", "<", ">"] | regExp.getAMatchedString() = s)
@@ -101,10 +101,13 @@ module Shared {
     }
   }
 
+  /** DEPRECATED: Alias for ContainsHtmlGuard */
+  deprecated class ContainsHTMLGuard = ContainsHtmlGuard;
+
   /**
    * Holds if `str` is used in a switch-case that has cases matching HTML escaping.
    */
-  private predicate isUsedInHTMLEscapingSwitch(Expr str) {
+  private predicate isUsedInHtmlEscapingSwitch(Expr str) {
     exists(SwitchStmt switch |
       // "\"".charCodeAt(0) == 34, "&".charCodeAt(0) == 38, "<".charCodeAt(0) == 60
       forall(int c | c = [34, 38, 60] | c = switch.getACase().getExpr().getIntValue()) and
@@ -133,7 +136,7 @@ module Shared {
    * The `pragma[noinline]` is to avoid materializing a cartesian product.
    */
   pragma[noinline]
-  private SsaVariable getAPathEscapedInSwitch() { isUsedInHTMLEscapingSwitch(result.getAUse()) }
+  private SsaVariable getAPathEscapedInSwitch() { isUsedInHtmlEscapingSwitch(result.getAUse()) }
 
   /**
    * An expression that is sanitized by a switch-case.
@@ -257,11 +260,11 @@ module DomBasedXss {
   class DomSink extends Sink {
     DomSink() {
       // Call to a DOM function that inserts its argument into the DOM
-      any(DomMethodCallExpr call).interpretsArgumentsAsHTML(this.asExpr())
+      any(DomMethodCallExpr call).interpretsArgumentsAsHtml(this.asExpr())
       or
       // Assignment to a dangerous DOM property
       exists(DomPropWriteNode pw |
-        pw.interpretsValueAsHTML() and
+        pw.interpretsValueAsHtml() and
         this = DataFlow::valueNode(pw.getRhs())
       )
       or
@@ -302,7 +305,7 @@ module DomBasedXss {
   class DangerouslySetInnerHtmlSink extends Sink, DataFlow::ValueNode {
     DangerouslySetInnerHtmlSink() {
       exists(DataFlow::Node danger, DataFlow::SourceNode valueSrc |
-        exists(JSXAttribute attr |
+        exists(JsxAttribute attr |
           attr.getName() = "dangerouslySetInnerHTML" and
           attr.getValue() = danger.asExpr()
         )
@@ -323,7 +326,7 @@ module DomBasedXss {
    */
   class TooltipSink extends Sink {
     TooltipSink() {
-      exists(JSXElement el |
+      exists(JsxElement el |
         el.getAttributeByName("data-html").getStringValue() = "true" or
         el.getAttributeByName("data-html").getValue().mayHaveBooleanValue(true)
       |
@@ -446,7 +449,7 @@ module DomBasedXss {
     )
   }
 
-  private class ContainsHTMLGuard extends SanitizerGuard, Shared::ContainsHTMLGuard { }
+  private class ContainsHtmlGuard extends SanitizerGuard, Shared::ContainsHtmlGuard { }
 }
 
 /** Provides classes and predicates for the reflected XSS query. */
@@ -555,7 +558,7 @@ module ReflectedXss {
 
   private class QuoteGuard extends SanitizerGuard, Shared::QuoteGuard { }
 
-  private class ContainsHTMLGuard extends SanitizerGuard, Shared::ContainsHTMLGuard { }
+  private class ContainsHtmlGuard extends SanitizerGuard, Shared::ContainsHtmlGuard { }
 }
 
 /** Provides classes and predicates for the stored XSS query. */
@@ -595,7 +598,7 @@ module StoredXss {
 
   private class QuoteGuard extends SanitizerGuard, Shared::QuoteGuard { }
 
-  private class ContainsHTMLGuard extends SanitizerGuard, Shared::ContainsHTMLGuard { }
+  private class ContainsHtmlGuard extends SanitizerGuard, Shared::ContainsHtmlGuard { }
 }
 
 /** Provides classes and predicates for the XSS through DOM query. */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll
index aa7679b88e0..534cc22708a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll
@@ -88,8 +88,8 @@ module XssThroughDom {
   /**
    * A source for text from the DOM from a DOM property read or call to `getAttribute()`.
    */
-  class DOMTextSource extends Source {
-    DOMTextSource() {
+  class DomTextSource extends Source {
+    DomTextSource() {
       exists(DataFlow::PropRead read | read = this |
         read.getBase().getALocalSource() = DOM::domValueRef() and
         read.mayHavePropertyName(unsafeDomPropertyName())
@@ -103,6 +103,9 @@ module XssThroughDom {
     }
   }
 
+  /** DEPRECATED: Alias for DomTextSource */
+  deprecated class DOMTextSource = DomTextSource;
+
   /**
    * A test of form `typeof x === "something"`, preventing `x` from being a string in some cases.
    *
@@ -149,7 +152,7 @@ module XssThroughDom {
      */
     class FormikSource extends Source {
       FormikSource() {
-        exists(JSXElement elem |
+        exists(JsxElement elem |
           formik().getAPropertyRead("Formik").flowsToExpr(elem.getNameExpr())
         |
           this =
@@ -176,7 +179,7 @@ module XssThroughDom {
      */
     class ReactFinalFormSource extends Source {
       ReactFinalFormSource() {
-        exists(JSXElement elem |
+        exists(JsxElement elem |
           DataFlow::moduleMember("react-final-form", "Form").flowsToExpr(elem.getNameExpr())
         |
           this =
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll b/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll
index 824eb9de7ae..91b2d1d0378 100644
--- a/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll
+++ b/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll
@@ -119,18 +119,18 @@ class EmptyPositiveSubPatttern extends RegExpSubPattern {
  * whose root node is not a disjunction.
  */
 class RegExpRoot extends RegExpTerm {
-  RegExpParent parent;
-
   RegExpRoot() {
-    exists(RegExpAlt alt |
-      alt.isRootTerm() and
-      this = alt.getAChild() and
-      parent = alt.getParent()
+    exists(RegExpParent parent |
+      exists(RegExpAlt alt |
+        alt.isRootTerm() and
+        this = alt.getAChild() and
+        parent = alt.getParent()
+      )
+      or
+      this.isRootTerm() and
+      not this instanceof RegExpAlt and
+      parent = this.getParent()
     )
-    or
-    this.isRootTerm() and
-    not this instanceof RegExpAlt and
-    parent = this.getParent()
   }
 
   /**
@@ -466,13 +466,14 @@ private module CharacterClasses {
    * An implementation of `CharacterClass` for \d, \s, and \w.
    */
   private class PositiveCharacterClassEscape extends CharacterClass {
-    RegExpTerm cc;
     string charClass;
 
     PositiveCharacterClassEscape() {
-      isEscapeClass(cc, charClass) and
-      this = getCanonicalCharClass(cc) and
-      charClass = ["d", "s", "w"]
+      exists(RegExpTerm cc |
+        isEscapeClass(cc, charClass) and
+        this = getCanonicalCharClass(cc) and
+        charClass = ["d", "s", "w"]
+      )
     }
 
     override string getARelevantChar() {
@@ -504,13 +505,14 @@ private module CharacterClasses {
    * An implementation of `CharacterClass` for \D, \S, and \W.
    */
   private class NegativeCharacterClassEscape extends CharacterClass {
-    RegExpTerm cc;
     string charClass;
 
     NegativeCharacterClassEscape() {
-      isEscapeClass(cc, charClass) and
-      this = getCanonicalCharClass(cc) and
-      charClass = ["D", "S", "W"]
+      exists(RegExpTerm cc |
+        isEscapeClass(cc, charClass) and
+        this = getCanonicalCharClass(cc) and
+        charClass = ["D", "S", "W"]
+      )
     }
 
     override string getARelevantChar() {
diff --git a/javascript/ql/src/AngularJS/DuplicateDependency.ql b/javascript/ql/src/AngularJS/DuplicateDependency.ql
index c7d7e0c55d2..e0f0c4954cb 100644
--- a/javascript/ql/src/AngularJS/DuplicateDependency.ql
+++ b/javascript/ql/src/AngularJS/DuplicateDependency.ql
@@ -12,7 +12,7 @@
 import javascript
 import semmle.javascript.RestrictedLocations
 
-predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, ASTNode location) {
+predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, AstNode location) {
   exists(int i, int j |
     i < j and
     exists(f.getDependencyDeclaration(i, name)) and
@@ -20,7 +20,7 @@ predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, AST
   )
 }
 
-from AngularJS::InjectableFunction f, ASTNode node, string name
+from AngularJS::InjectableFunction f, AstNode node, string name
 where
   isRepeatedDependency(f, name, node) and
   not count(f.asFunction().getParameterByName(name)) > 1 // avoid duplicating reports from js/duplicate-parameter-name
diff --git a/javascript/ql/src/AngularJS/RepeatedInjection.ql b/javascript/ql/src/AngularJS/RepeatedInjection.ql
index 246fbbdbd1c..3f2e535fdd0 100644
--- a/javascript/ql/src/AngularJS/RepeatedInjection.ql
+++ b/javascript/ql/src/AngularJS/RepeatedInjection.ql
@@ -12,7 +12,7 @@
 import javascript
 import semmle.javascript.RestrictedLocations
 
-from AngularJS::InjectableFunction f, ASTNode explicitInjection
+from AngularJS::InjectableFunction f, AstNode explicitInjection
 where
   count(f.getAnExplicitDependencyInjection()) > 1 and
   explicitInjection = f.getAnExplicitDependencyInjection()
diff --git a/javascript/ql/src/AngularJS/UnusedAngularDependency.ql b/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
index b3e0773a157..4eb22c33695 100644
--- a/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
+++ b/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
@@ -21,7 +21,7 @@ predicate isUnusedParameter(Function f, string msg, Parameter parameter) {
   )
 }
 
-predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, ASTNode location) {
+predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, AstNode location) {
   exists(int paramCount, int injectionCount |
     DataFlow::valueNode(location) = f and
     paramCount = f.asFunction().getNumParameter() and
@@ -41,7 +41,7 @@ predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, ASTNod
   )
 }
 
-from AngularJS::InjectableFunction f, string message, ASTNode location
+from AngularJS::InjectableFunction f, string message, AstNode location
 where
   isUnusedParameter(f.asFunction(), message, location) or isMissingParameter(f, message, location)
 select location.(FirstLineOf), message
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index af7e04b0c8a..ff7152ddc0a 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.0.12
+
 ## 0.0.11
 
 ### New Queries
diff --git a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
index 4877062a84e..70b3ba0e2e2 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
@@ -35,7 +35,7 @@ where
   // the variable should be accessed somewhere; otherwise it will be flagged by UnusedVariable
   exists(v.getAnAccess()) and
   // don't flag ambient variable definitions
-  not dead.(ASTNode).isAmbient() and
+  not dead.(AstNode).isAmbient() and
   // don't flag variables with ambient uses
   not exists(LexicalAccess access |
     access.getALexicalName() = v.getADeclaration().getALexicalName() and
@@ -55,7 +55,7 @@ where
   // don't flag default inits that are later overwritten
   not (isDefaultInit(dead.getSource().(Expr).getUnderlyingValue()) and dead.isOverwritten(v)) and
   // don't flag assignments in externs
-  not dead.(ASTNode).inExternsFile() and
+  not dead.(AstNode).inExternsFile() and
   // don't flag exported variables
   not any(ES2015Module m).exportsAs(v, _) and
   // don't flag 'exports' assignments in closure modules
@@ -70,5 +70,5 @@ where
     else msg = "The value assigned to " + v.getName() + " here is unused."
   ) and
   // ignore Angular templates
-  not dead.(ASTNode).getTopLevel() instanceof Angular2::TemplateTopLevel
+  not dead.(AstNode).getTopLevel() instanceof Angular2::TemplateTopLevel
 select dead, msg
diff --git a/javascript/ql/src/Declarations/DeadStoreOfProperty.ql b/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
index d0866768bc5..48b574f8cd1 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
@@ -101,7 +101,7 @@ predicate isDeadAssignment(string name, DataFlow::PropWrite assign1, DataFlow::P
     noPropAccessBetweenInsideBasicBlock(name, assign1, assign2) or
     noPropAccessBetweenAcrossBasicBlocks(name, assign1, assign2)
   ) and
-  not isDOMProperty(name)
+  not isDomProperty(name)
 }
 
 /**
diff --git a/javascript/ql/src/Declarations/Definitions.qll b/javascript/ql/src/Declarations/Definitions.qll
index 2f83cb80a60..a7034ad5093 100644
--- a/javascript/ql/src/Declarations/Definitions.qll
+++ b/javascript/ql/src/Declarations/Definitions.qll
@@ -1,7 +1,10 @@
 import javascript
 
-/** An identifier appearing in a defining position. */
-class DefiningIdentifier extends Identifier {
+/**
+ * DEPRECATED: Use `SsaDefinition` from `SSA.qll` instead.
+ * An identifier appearing in a defining position.
+ */
+deprecated class DefiningIdentifier extends Identifier {
   DefiningIdentifier() {
     this instanceof VarDecl or
     exists(Assignment assgn | this = assgn.getLhs()) or
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
index 8fb405a7cf9..64a78908eec 100644
--- a/javascript/ql/src/Declarations/UnusedVariable.ql
+++ b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -37,20 +37,20 @@ predicate isPropertyFilter(UnusedLocal v) {
 }
 
 predicate hasJsxInScope(UnusedLocal v) {
-  any(JSXNode n).getParent+() = v.getScope().getScopeElement()
+  any(JsxNode n).getParent+() = v.getScope().getScopeElement()
 }
 
 /**
  * Holds if `v` is a "React" variable that is implicitly used by a JSX element.
  */
-predicate isReactForJSX(UnusedLocal v) {
+predicate isReactForJsx(UnusedLocal v) {
   hasJsxInScope(v) and
   (
     v.getName() = "React"
     or
     exists(TopLevel tl | tl = v.getADeclaration().getTopLevel() |
       // legacy `@jsx` pragmas
-      exists(JSXPragma p | p.getTopLevel() = tl | p.getDOMName() = v.getName())
+      exists(JsxPragma p | p.getTopLevel() = tl | p.getDomName() = v.getName())
       or
       // JSX pragma from a .babelrc file
       exists(Babel::TransformReactJsxConfig plugin |
@@ -59,7 +59,7 @@ predicate isReactForJSX(UnusedLocal v) {
       )
     )
     or
-    exists(JSONObject tsconfig |
+    exists(JsonObject tsconfig |
       tsconfig.isTopLevel() and tsconfig.getFile().getBaseName() = "tsconfig.json"
     |
       v.getName() =
@@ -148,7 +148,7 @@ predicate whitelisted(UnusedLocal v) {
   isPropertyFilter(v)
   or
   // exclude imports of React that are implicitly referenced by JSX
-  isReactForJSX(v)
+  isReactForJsx(v)
   or
   // exclude names that are used as types
   exists(VarDecl vd | v = vd.getVariable() |
@@ -198,7 +198,7 @@ predicate unusedImports(ImportVarDeclProvider provider, string msg) {
   )
 }
 
-from ASTNode sel, string msg
+from AstNode sel, string msg
 where
   (
     unusedNonImports(sel, msg) or
diff --git a/javascript/ql/src/Expressions/Clones.qll b/javascript/ql/src/Expressions/Clones.qll
index 612cccd406f..a5d90509403 100644
--- a/javascript/ql/src/Expressions/Clones.qll
+++ b/javascript/ql/src/Expressions/Clones.qll
@@ -7,7 +7,7 @@ import javascript
 /**
  * Gets an opaque integer value encoding the type of AST node `nd`.
  */
-private int kindOf(ASTNode nd) {
+private int kindOf(AstNode nd) {
   // map expression kinds to even non-negative numbers
   result = nd.(Expr).getKind() * 2
   or
@@ -25,7 +25,7 @@ private int kindOf(ASTNode nd) {
 /**
  * Holds if `nd` has the given `kind`, and its number of children is `arity`.
  */
-private predicate kindAndArity(ASTNode nd, int kind, int arity) {
+private predicate kindAndArity(AstNode nd, int kind, int arity) {
   kindOf(nd) = kind and arity = nd.getNumChild()
 }
 
@@ -35,7 +35,7 @@ private predicate kindAndArity(ASTNode nd, int kind, int arity) {
  *
  * Every AST node has at most one value.
  */
-private string valueOf(ASTNode nd) {
+private string valueOf(AstNode nd) {
   result = nd.(Literal).getRawValue() or
   result = nd.(TemplateElement).getRawValue() or
   result = nd.(Identifier).getName()
@@ -47,18 +47,18 @@ private string valueOf(ASTNode nd) {
  * Clients must override the `candidate()` method to identify the
  * nodes for which structural comparison will be interesting.
  */
-abstract class StructurallyCompared extends ASTNode {
+abstract class StructurallyCompared extends AstNode {
   /**
    * Gets a candidate node that we may want to structurally compare this node to.
    */
-  abstract ASTNode candidate();
+  abstract AstNode candidate();
 
   /**
    * Gets a node that structurally corresponds to this node, either because it is
    * a candidate node, or because it is at the same position relative to a
    * candidate node as this node.
    */
-  ASTNode candidateInternal() {
+  AstNode candidateInternal() {
     // in order to correspond, nodes need to have the same kind and shape
     exists(int kind, int numChildren | kindAndArity(this, kind, numChildren) |
       result = this.candidateKind(kind, numChildren)
@@ -71,18 +71,18 @@ abstract class StructurallyCompared extends ASTNode {
    * Gets a node that structurally corresponds to the parent node of this node,
    * where this node is the `i`th child of its parent.
    */
-  private ASTNode getAStructuralUncle(int i) {
+  private AstNode getAStructuralUncle(int i) {
     exists(StructurallyCompared parent | this = parent.getChild(i) |
       result = parent.candidateInternal()
     )
   }
 
-  private ASTNode candidateKind(int kind, int numChildren) {
+  private AstNode candidateKind(int kind, int numChildren) {
     result = this.candidate() and kindAndArity(result, kind, numChildren)
   }
 
   pragma[noinline]
-  private ASTNode uncleKind(int kind, int numChildren) {
+  private AstNode uncleKind(int kind, int numChildren) {
     exists(int i | result = this.getAStructuralUncle(i).getChild(i)) and
     kindAndArity(result, kind, numChildren)
   }
@@ -92,7 +92,7 @@ abstract class StructurallyCompared extends ASTNode {
    * rooted at node `that`, where `that` structurally corresponds to `this` as
    * determined by `candidateInternal`.
    */
-  private predicate sameInternal(ASTNode that) {
+  private predicate sameInternal(AstNode that) {
     that = this.candidateInternal() and
     /*
      * Check that `this` and `that` bind to the same variable, if any.
@@ -120,7 +120,7 @@ abstract class StructurallyCompared extends ASTNode {
    * rooted at node `that`, which must be a candidate node as determined by
    * `candidate`.
    */
-  predicate same(ASTNode that) {
+  predicate same(AstNode that) {
     that = this.candidate() and
     this.sameInternal(that)
   }
@@ -132,7 +132,7 @@ abstract class StructurallyCompared extends ASTNode {
 private class InternalCandidate extends StructurallyCompared {
   InternalCandidate() { exists(this.getParent().(StructurallyCompared).candidateInternal()) }
 
-  override ASTNode candidate() { none() }
+  override AstNode candidate() { none() }
 }
 
 /**
diff --git a/javascript/ql/src/Expressions/HeterogeneousComparison.ql b/javascript/ql/src/Expressions/HeterogeneousComparison.ql
index a736fa5cdc9..3b4c59f08b6 100644
--- a/javascript/ql/src/Expressions/HeterogeneousComparison.ql
+++ b/javascript/ql/src/Expressions/HeterogeneousComparison.ql
@@ -24,7 +24,7 @@ private import semmle.javascript.DefensiveProgramming
  * Besides the usual comparison operators, `switch` statements are also considered to be comparisons,
  * with the switched-on expression being the right operand and all case labels the left operands.
  */
-predicate comparisonOperands(ASTNode nd, Expr left, Expr right) {
+predicate comparisonOperands(AstNode nd, Expr left, Expr right) {
   exists(Comparison cmp | cmp = nd | left = cmp.getLeftOperand() and right = cmp.getRightOperand())
   or
   exists(SwitchStmt switch | switch = nd |
@@ -45,7 +45,7 @@ predicate hasImplicitConversionMethod(DefiniteAbstractValue av) {
 /**
  * Gets a type of `operand`, which is an operand of the strict equality test `eq`.
  */
-InferredType strictEqualityOperandType(ASTNode eq, DataFlow::AnalyzedNode operand) {
+InferredType strictEqualityOperandType(AstNode eq, DataFlow::AnalyzedNode operand) {
   // strict equality tests do no conversion at all
   operand.asExpr() = eq.(StrictEqualityTest).getAChildExpr() and result = operand.getAType()
   or
@@ -60,7 +60,7 @@ InferredType strictEqualityOperandType(ASTNode eq, DataFlow::AnalyzedNode operan
  * Holds if `operand` is an operand of the non-strict equality test or relational
  * operator `parent`, and may have a `toString` or `valueOf` method.
  */
-predicate implicitlyConvertedOperand(ASTNode parent, DataFlow::AnalyzedNode operand) {
+predicate implicitlyConvertedOperand(AstNode parent, DataFlow::AnalyzedNode operand) {
   (parent instanceof NonStrictEqualityTest or parent instanceof RelationalComparison) and
   operand.asExpr() = parent.getAChildExpr() and
   hasImplicitConversionMethod(operand.getAValue())
@@ -70,7 +70,7 @@ predicate implicitlyConvertedOperand(ASTNode parent, DataFlow::AnalyzedNode oper
  * Gets a type of `operand`, which is an operand of the non-strict equality test or
  * relational operator `parent`.
  */
-InferredType nonStrictOperandType(ASTNode parent, DataFlow::AnalyzedNode operand) {
+InferredType nonStrictOperandType(AstNode parent, DataFlow::AnalyzedNode operand) {
   // non-strict equality tests perform conversions
   operand.asExpr() = parent.(NonStrictEqualityTest).getAChildExpr() and
   exists(InferredType tp | tp = operand.getAValue().getType() |
@@ -109,7 +109,7 @@ InferredType nonStrictOperandType(ASTNode parent, DataFlow::AnalyzedNode operand
  * Gets a type that `operand`, which is an operand of comparison `parent`,
  * could be converted to at runtime.
  */
-InferredType convertedOperandType(ASTNode parent, DataFlow::AnalyzedNode operand) {
+InferredType convertedOperandType(AstNode parent, DataFlow::AnalyzedNode operand) {
   result = strictEqualityOperandType(parent, operand)
   or
   // if `operand` might have `toString`/`valueOf`, just assume it could
@@ -125,7 +125,7 @@ InferredType convertedOperandType(ASTNode parent, DataFlow::AnalyzedNode operand
  * common type they coerce to.
  */
 predicate isHeterogeneousComparison(
-  ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
+  AstNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
   string rightTypes
 ) {
   comparisonOperands(cmp, left.asExpr(), right.asExpr()) and
@@ -188,7 +188,7 @@ predicate isInitialParameterUse(Expr e) {
 predicate whitelist(Expr e) { isInitialParameterUse(e) }
 
 from
-  ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
+  AstNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
   string rightTypes, string leftExprDescription, string rightExprDescription, int leftTypeCount,
   int rightTypeCount, string leftTypeDescription, string rightTypeDescription
 where
diff --git a/javascript/ql/src/Expressions/SelfAssignment.ql b/javascript/ql/src/Expressions/SelfAssignment.ql
index 6aab4c46bb2..784f01fa742 100644
--- a/javascript/ql/src/Expressions/SelfAssignment.ql
+++ b/javascript/ql/src/Expressions/SelfAssignment.ql
@@ -41,7 +41,7 @@ where
     propName = any(AccessorMethodDeclaration amd).getName()
   ) and
   // exclude DOM properties
-  not isDOMProperty(e.(PropAccess).getPropertyName()) and
+  not isDomProperty(e.(PropAccess).getPropertyName()) and
   // exclude self-assignments that have been inserted to satisfy the TypeScript JS-checker
   not e.getAssignment().getParent().(ExprStmt).getDocumentation().getATag().getTitle() = "type" and
   // exclude self-assignments in speculatively parsed template files
diff --git a/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql b/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
index 4ae3504d843..04509a9004b 100644
--- a/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
+++ b/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
@@ -83,9 +83,9 @@ private predicate isBoundInMethod(MethodDeclaration method) {
  * Gets an event handler attribute (onClick, onTouch, ...).
  */
 private DOM::AttributeDefinition getAnEventHandlerAttribute() {
-  exists(ReactComponent c, JSXNode rendered, string attributeName |
+  exists(ReactComponent c, JsxNode rendered, string attributeName |
     c.getRenderMethod().getAReturnedExpr().flow().getALocalSource().asExpr() = rendered and
-    result = rendered.getABodyElement*().(JSXElement).getAttributeByName(attributeName) and
+    result = rendered.getABodyElement*().(JsxElement).getAttributeByName(attributeName) and
     attributeName.regexpMatch("on[A-Z][a-zA-Z]+") // camelCased with 'on'-prefix
   )
 }
diff --git a/javascript/ql/src/LanguageFeatures/BadTypeof.ql b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
index 1773f79bb53..1da17f3a8e8 100644
--- a/javascript/ql/src/LanguageFeatures/BadTypeof.ql
+++ b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
@@ -20,7 +20,7 @@ import javascript
  * A comparison construct, that is, either an equality test or a switch case
  * (which is implicitly compared to the switch statement's discriminant).
  */
-class EqOrSwitch extends ASTNode {
+class EqOrSwitch extends AstNode {
   EqOrSwitch() {
     this instanceof EqualityTest or
     this instanceof Case
diff --git a/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql b/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
index 6c81cf90fc5..db33566a758 100644
--- a/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
+++ b/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
@@ -18,7 +18,7 @@ import javascript
  * Holds if `nd` is a use of deprecated language feature `type`, and `replacement`
  * is the recommended replacement.
  */
-predicate deprecated_feature(ASTNode nd, string type, string replacement) {
+predicate deprecated_feature(AstNode nd, string type, string replacement) {
   exists(FunctionExpr fe | fe = nd and fe.getBody() instanceof Expr |
     type = "expression closures" and replacement = "arrow expressions"
   )
@@ -38,6 +38,6 @@ predicate deprecated_feature(ASTNode nd, string type, string replacement) {
   replacement = "standard method definitions"
 }
 
-from ASTNode depr, string type, string replacement
+from AstNode depr, string type, string replacement
 where deprecated_feature(depr, type, replacement)
 select depr, "Use " + replacement + " instead of " + type + "."
diff --git a/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql b/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
index 3715bb713ab..daa34825939 100644
--- a/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
+++ b/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
@@ -17,11 +17,10 @@ class CandidateTopLevel extends TopLevel {
 
 /** A string literal in a toplevel that contains at least one template literal. */
 class CandidateStringLiteral extends StringLiteral {
-  CandidateTopLevel tl;
   string v;
 
   CandidateStringLiteral() {
-    tl = this.getTopLevel() and
+    this.getTopLevel() instanceof CandidateTopLevel and
     v = this.getStringValue()
   }
 
@@ -43,10 +42,10 @@ class CandidateStringLiteral extends StringLiteral {
    * Gets an ancestor node of this string literal in the AST that can be reached without
    * stepping over scope elements.
    */
-  ASTNode getIntermediate() {
+  AstNode getIntermediate() {
     result = this
     or
-    exists(ASTNode mid | mid = this.getIntermediate() |
+    exists(AstNode mid | mid = this.getIntermediate() |
       not mid instanceof ScopeElement and
       result = mid.getParent()
     )
diff --git a/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql b/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
index 91e5f58eee6..46319ab3a6f 100644
--- a/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
+++ b/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
@@ -11,7 +11,7 @@
 
 import javascript
 
-from JSONValue v, File f
+from JsonValue v, File f
 where
   f = v.getFile() and
   f.getExtension().regexpMatch("(?i)jsx?") and
diff --git a/javascript/ql/src/Metrics/ES20xxFeatures.qll b/javascript/ql/src/Metrics/ES20xxFeatures.qll
index ddc40d7f8df..8069ba5e50f 100644
--- a/javascript/ql/src/Metrics/ES20xxFeatures.qll
+++ b/javascript/ql/src/Metrics/ES20xxFeatures.qll
@@ -13,7 +13,7 @@ import javascript
  * (https://kangax.github.io/compat-table/es6/) and [ECMAScript next compatibility table]
  * (https://kangax.github.io/compat-table/esnext/).
  */
-predicate isES20xxFeature(ASTNode nd, int version, string category) {
+predicate isES20xxFeature(AstNode nd, int version, string category) {
   version = 2015 and
   (
     exists(nd.(Parameter).getDefault()) and category = "default function parameters"
diff --git a/javascript/ql/src/Metrics/FUseOfES6.ql b/javascript/ql/src/Metrics/FUseOfES6.ql
index e683cc23629..41f042ce183 100644
--- a/javascript/ql/src/Metrics/FUseOfES6.ql
+++ b/javascript/ql/src/Metrics/FUseOfES6.ql
@@ -12,4 +12,4 @@
 import ES20xxFeatures
 
 from File f
-select f, count(ASTNode nd | nd.getFile() = f and isES20xxFeature(nd, _, _)) as n order by n desc
+select f, count(AstNode nd | nd.getFile() = f and isES20xxFeature(nd, _, _)) as n order by n desc
diff --git a/javascript/ql/src/NodeJS/CyclicImport.ql b/javascript/ql/src/NodeJS/CyclicImport.ql
index 0613b75ccc0..d34dcb587dc 100644
--- a/javascript/ql/src/NodeJS/CyclicImport.ql
+++ b/javascript/ql/src/NodeJS/CyclicImport.ql
@@ -64,7 +64,7 @@ predicate relatedModules(NodeModule m, NodeModule n) {
   n = m.getAnImportedModule() or m = n.getAnImportedModule()
 }
 
-from NodeModule m, Require r, NodeModule imported, string msg, ASTNode linktarget, string linktext
+from NodeModule m, Require r, NodeModule imported, string msg, AstNode linktarget, string linktext
 where
   r = m.getAnImport() and
   imported = r.getImportedModule() and
diff --git a/javascript/ql/src/NodeJS/UnresolvableImport.ql b/javascript/ql/src/NodeJS/UnresolvableImport.ql
index c478a5ebe9d..16feba14348 100644
--- a/javascript/ql/src/NodeJS/UnresolvableImport.ql
+++ b/javascript/ql/src/NodeJS/UnresolvableImport.ql
@@ -16,10 +16,10 @@ import javascript
  * Gets the `package.json` of the nearest enclosing NPM package to which
  * file `f` belongs.
  */
-PackageJSON getClosestPackageJSON(Folder f) {
-  result = f.(NPMPackage).getPackageJSON()
+PackageJson getClosestPackageJson(Folder f) {
+  result = f.(NpmPackage).getPackageJson()
   or
-  not f instanceof NPMPackage and result = getClosestPackageJSON(f.getParentContainer())
+  not f instanceof NpmPackage and result = getClosestPackageJson(f.getParentContainer())
 }
 
 from Require r, string path, string mod
@@ -35,14 +35,14 @@ where
   // import cannot be resolved statically
   not exists(r.getImportedModule()) and
   // no enclosing NPM package declares a dependency on `mod`
-  forex(NPMPackage pkg, PackageJSON pkgJSON |
-    pkg.getAModule() = r.getTopLevel() and pkgJSON = pkg.getPackageJSON()
+  forex(NpmPackage pkg, PackageJson pkgJson |
+    pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson()
   |
-    not pkgJSON.declaresDependency(mod, _) and
-    not pkgJSON.getPeerDependencies().getADependency(mod, _) and
+    not pkgJson.declaresDependency(mod, _) and
+    not pkgJson.getPeerDependencies().getADependency(mod, _) and
     // exclude packages depending on `fbjs`, which automatically pulls in many otherwise
     // undeclared dependencies
-    not pkgJSON.declaresDependency("fbjs", _)
+    not pkgJson.declaresDependency("fbjs", _)
   )
 select r, "Module " + mod + " cannot be resolved, and is not declared as a dependency in $@.",
-  getClosestPackageJSON(r.getFile().getParentContainer()), "package.json"
+  getClosestPackageJson(r.getFile().getParentContainer()), "package.json"
diff --git a/javascript/ql/src/NodeJS/UnusedDependency.ql b/javascript/ql/src/NodeJS/UnusedDependency.ql
index 7566c133296..45bbde37294 100644
--- a/javascript/ql/src/NodeJS/UnusedDependency.ql
+++ b/javascript/ql/src/NodeJS/UnusedDependency.ql
@@ -16,19 +16,19 @@ import javascript
  * Holds if the NPM package `pkg` declares a dependency on package `name`,
  * and `dep` is the corresponding declaration in the `package.json` file.
  */
-predicate declaresDependency(NPMPackage pkg, string name, JSONValue dep) {
-  dep = pkg.getPackageJSON().getDependencies().getPropValue(name)
+predicate declaresDependency(NpmPackage pkg, string name, JsonValue dep) {
+  dep = pkg.getPackageJson().getDependencies().getPropValue(name)
 }
 
 /**
  * Gets a path expression in a module belonging to `pkg`.
  */
-PathExpr getAPathExpr(NPMPackage pkg) { result.getEnclosingModule() = pkg.getAModule() }
+PathExpr getAPathExpr(NpmPackage pkg) { result.getEnclosingModule() = pkg.getAModule() }
 
 /**
  * Gets a URL-valued attribute in a module or HTML file belonging to `pkg`.
  */
-DOM::AttributeDefinition getAURLAttribute(NPMPackage pkg) {
+DOM::AttributeDefinition getAUrlAttribute(NpmPackage pkg) {
   result.getFile() = pkg.getAFile() and
   DOM::isUrlValuedAttribute(result)
 }
@@ -37,10 +37,10 @@ DOM::AttributeDefinition getAURLAttribute(NPMPackage pkg) {
  * Gets the name of a script in the 'scripts' object of `pkg`.
  * The script makes use of a declared `dependency` of `pkg`.
  */
-string getPackageScriptNameWithDependency(NPMPackage pkg, string dependency) {
-  exists(JSONObject scriptsObject, string scriptName, string script |
+string getPackageScriptNameWithDependency(NpmPackage pkg, string dependency) {
+  exists(JsonObject scriptsObject, string scriptName, string script |
     declaresDependency(pkg, dependency, _) and
-    scriptsObject = pkg.getPackageJSON().getPropValue("scripts") and
+    scriptsObject = pkg.getPackageJson().getPropValue("scripts") and
     script = scriptsObject.getPropStringValue(scriptName) and
     script.regexpMatch(".*\\b\\Q" + dependency + "\\E\\b.*") and
     result = scriptName
@@ -51,7 +51,7 @@ string getPackageScriptNameWithDependency(NPMPackage pkg, string dependency) {
  * Holds if the NPM package `pkg` declares a dependency on package `name`,
  * and uses it at least once.
  */
-predicate usesDependency(NPMPackage pkg, string name) {
+predicate usesDependency(NpmPackage pkg, string name) {
   declaresDependency(pkg, name, _) and
   (
     // there is a path expression (e.g., in a `require` or `import`) that
@@ -62,7 +62,7 @@ predicate usesDependency(NPMPackage pkg, string name) {
     )
     or
     // there is an HTML URL attribute that may reference `pkg`
-    exists(DOM::AttributeDefinition attr | attr = getAURLAttribute(pkg) |
+    exists(DOM::AttributeDefinition attr | attr = getAUrlAttribute(pkg) |
       // check whether the URL contains `node_modules/name`
       attr.getStringValue().regexpMatch(".*\\bnode_modules/\\Q" + name + "\\E(/.*)?")
     )
@@ -85,7 +85,7 @@ predicate usesDependency(NPMPackage pkg, string name) {
  * view engine definitions, which (may) implicitly require the specified
  * engine as a module.
  */
-predicate implicitRequire(NPMPackage pkg, string name) {
+predicate implicitRequire(NpmPackage pkg, string name) {
   // look for Express `set('view engine', ...)` calls
   exists(MethodCallExpr setViewEngine, string engine |
     Express::appCreation().flowsToExpr(setViewEngine.getReceiver()) and
@@ -99,7 +99,7 @@ predicate implicitRequire(NPMPackage pkg, string name) {
   )
 }
 
-from NPMPackage pkg, string name, JSONValue dep
+from NpmPackage pkg, string name, JsonValue dep
 where
   exists(pkg.getAModule()) and
   declaresDependency(pkg, name, dep) and
diff --git a/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql b/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
index 1d00abb104b..045edc172f3 100644
--- a/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
+++ b/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
@@ -11,7 +11,7 @@
 import javascript
 import semmle.javascript.security.dataflow.ExternalAPIUsedWithUntrustedDataQuery
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql b/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql
index dccbdd695ef..03a7a75828b 100644
--- a/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql
+++ b/javascript/ql/src/Security/CWE-020/IncorrectSuffixCheck.ql
@@ -123,12 +123,13 @@ predicate isDerivedFromLength(DataFlow::Node length, DataFlow::Node operand) {
  */
 class UnsafeIndexOfComparison extends EqualityTest {
   IndexOfCall indexOf;
-  DataFlow::Node testedValue;
 
   UnsafeIndexOfComparison() {
-    this.hasOperands(indexOf.getAUse(), testedValue.asExpr()) and
-    isDerivedFromLength(testedValue, indexOf.getReceiver()) and
-    isDerivedFromLength(testedValue, indexOf.getArgument(0)) and
+    exists(DataFlow::Node testedValue |
+      this.hasOperands(indexOf.getAUse(), testedValue.asExpr()) and
+      isDerivedFromLength(testedValue, indexOf.getReceiver()) and
+      isDerivedFromLength(testedValue, indexOf.getArgument(0))
+    ) and
     // Ignore cases like `x.indexOf("/") === x.length - 1` that can only be bypassed if `x` is the empty string.
     // Sometimes strings are just known to be non-empty from the context, and it is unlikely to be a security issue,
     // since it's obviously not a domain name check.
diff --git a/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql b/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql
index 7bd17135e33..3a34708d91b 100644
--- a/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql
+++ b/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql
@@ -23,7 +23,7 @@ newtype TRegExpPatternMistake =
    * by `mistake`.
    */
   TIdentityEscapeInStringMistake(
-    RegExpPatternSource src, string char, string mistake, ASTNode rawStringNode, int index
+    RegExpPatternSource src, string char, string mistake, AstNode rawStringNode, int index
   ) {
     char = getALikelyRegExpPatternMistake(src, mistake, rawStringNode, index)
   } or
@@ -32,7 +32,7 @@ newtype TRegExpPatternMistake =
    * regular expression string `src`, indicating intent to use the
    * word-boundary assertion '\b'.
    */
-  TBackspaceInStringMistake(RegExpPatternSource src, ASTNode rawStringNode, int index) {
+  TBackspaceInStringMistake(RegExpPatternSource src, AstNode rawStringNode, int index) {
     exists(string raw, string cooked |
       exists(StringLiteral lit | lit = rawStringNode |
         rawStringNode = src.asExpr() and
@@ -91,7 +91,7 @@ class RegExpPatternMistake extends TRegExpPatternMistake {
   /** Gets a textual representation of this element. */
   string toString() { result = getMessage() }
 
-  abstract ASTNode getRawStringNode();
+  abstract AstNode getRawStringNode();
 
   abstract RegExpPatternSource getSrc();
 
@@ -109,7 +109,7 @@ class IdentityEscapeInStringMistake extends RegExpPatternMistake, TIdentityEscap
   string char;
   string mistake;
   int index;
-  ASTNode rawStringNode;
+  AstNode rawStringNode;
 
   IdentityEscapeInStringMistake() {
     this = TIdentityEscapeInStringMistake(src, char, mistake, rawStringNode, index)
@@ -123,7 +123,7 @@ class IdentityEscapeInStringMistake extends RegExpPatternMistake, TIdentityEscap
 
   override RegExpPatternSource getSrc() { result = src }
 
-  override ASTNode getRawStringNode() { result = rawStringNode }
+  override AstNode getRawStringNode() { result = rawStringNode }
 }
 
 /**
@@ -133,7 +133,7 @@ class IdentityEscapeInStringMistake extends RegExpPatternMistake, TIdentityEscap
 class BackspaceInStringMistake extends RegExpPatternMistake, TBackspaceInStringMistake {
   RegExpPatternSource src;
   int index;
-  ASTNode rawStringNode;
+  AstNode rawStringNode;
 
   BackspaceInStringMistake() { this = TBackspaceInStringMistake(src, rawStringNode, index) }
 
@@ -145,7 +145,7 @@ class BackspaceInStringMistake extends RegExpPatternMistake, TBackspaceInStringM
 
   override RegExpPatternSource getSrc() { result = src }
 
-  override ASTNode getRawStringNode() { result = rawStringNode }
+  override AstNode getRawStringNode() { result = rawStringNode }
 }
 
 from RegExpPatternMistake mistake
diff --git a/javascript/ql/src/Security/CWE-094/UnsafeCodeConstruction.ql b/javascript/ql/src/Security/CWE-094/UnsafeCodeConstruction.ql
index fa1f06ee9af..edae41e18ce 100644
--- a/javascript/ql/src/Security/CWE-094/UnsafeCodeConstruction.ql
+++ b/javascript/ql/src/Security/CWE-094/UnsafeCodeConstruction.ql
@@ -4,6 +4,7 @@
  *              user to execute arbitrary code.
  * @kind path-problem
  * @problem.severity warning
+ * @security-severity 6.1
  * @precision medium
  * @id js/unsafe-code-construction
  * @tags security
diff --git a/javascript/ql/src/Security/CWE-116/BadTagFilter.ql b/javascript/ql/src/Security/CWE-116/BadTagFilter.ql
index 5d0676b3406..1de903d6394 100644
--- a/javascript/ql/src/Security/CWE-116/BadTagFilter.ql
+++ b/javascript/ql/src/Security/CWE-116/BadTagFilter.ql
@@ -18,6 +18,6 @@
 
 import semmle.javascript.security.BadTagFilterQuery
 
-from HTMLMatchingRegExp regexp, string msg
+from HtmlMatchingRegExp regexp, string msg
 where msg = min(string m | isBadRegexpFilter(regexp, m) | m order by m.length(), m) // there might be multiple, we arbitrarily pick the shortest one
 select regexp, msg
diff --git a/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql b/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql
index 805b1966f55..99ca8cba8a7 100644
--- a/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql
+++ b/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql
@@ -69,7 +69,7 @@ DataFlow::Node getANodeModulePath(string path) {
  * Gets a folder that contains a `package.json` file.
  */
 pragma[noinline]
-Folder getAPackageJSONFolder() { result = any(PackageJSON json).getFile().getParentContainer() }
+Folder getAPackageJsonFolder() { result = any(PackageJson json).getFile().getParentContainer() }
 
 /**
  * Gets a reference to `dirname`, the home folder, the current working folder, or the root folder.
@@ -82,7 +82,7 @@ Folder getAPackageJSONFolder() { result = any(PackageJSON json).getFile().getPar
  */
 DataFlow::Node getALeakingFolder(string description) {
   exists(ModuleScope ms | result.asExpr() = ms.getVariable("__dirname").getAnAccess()) and
-  result.getFile().getParentContainer() = getAPackageJSONFolder() and
+  result.getFile().getParentContainer() = getAPackageJsonFolder() and
   (
     if result.getFile().getParentContainer().getRelativePath().trim() != ""
     then description = "the folder " + result.getFile().getParentContainer().getRelativePath()
diff --git a/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql b/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql
index 7547d4e31c1..42861fcb9be 100644
--- a/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql
+++ b/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql
@@ -13,26 +13,25 @@
 
 import javascript
 
-/**
- * Gets an options object for a TLS connection.
- */
-DataFlow::ObjectLiteralNode tlsOptions() {
-  exists(DataFlow::InvokeNode invk | result.flowsTo(invk.getAnArgument()) |
-    invk instanceof ClientRequest
-    or
-    invk = DataFlow::moduleMember("https", "Agent").getAnInstantiation()
-    or
-    exists(DataFlow::NewNode new |
-      new = DataFlow::moduleMember("tls", "TLSSocket").getAnInstantiation()
-    |
-      invk = new or
-      invk = new.getAMethodCall("renegotiate")
-    )
-    or
-    invk = DataFlow::moduleMember("tls", ["connect", "createServer"]).getACall()
+/** Gets options argument for a potential TLS connection */
+DataFlow::InvokeNode tlsInvocation() {
+  result instanceof ClientRequest
+  or
+  result = DataFlow::moduleMember("https", "Agent").getAnInstantiation()
+  or
+  exists(DataFlow::NewNode new |
+    new = DataFlow::moduleMember("tls", "TLSSocket").getAnInstantiation()
+  |
+    result = new or
+    result = new.getAMethodCall("renegotiate")
   )
+  or
+  result = DataFlow::moduleMember("tls", ["connect", "createServer"]).getACall()
 }
 
+/** Gets an options object for a TLS connection. */
+DataFlow::ObjectLiteralNode tlsOptions() { result.flowsTo(tlsInvocation().getAnArgument()) }
+
 from DataFlow::PropWrite disable
 where
   exists(DataFlow::SourceNode env |
@@ -41,6 +40,13 @@ where
     disable.getRhs().mayHaveStringValue("0")
   )
   or
-  disable = tlsOptions().getAPropertyWrite("rejectUnauthorized") and
+  (
+    disable = tlsOptions().getAPropertyWrite("rejectUnauthorized")
+    or
+    // the same thing, but with API-nodes if they happen to be available
+    exists(API::Node tlsInvk | tlsInvk.getAnInvocation() = tlsInvocation() |
+      disable.getRhs() = tlsInvk.getAParameter().getMember("rejectUnauthorized").getARhs()
+    )
+  ) and
   disable.getRhs().(AnalyzedNode).getTheBooleanValue() = false
 select disable, "Disabling certificate validation is strongly discouraged."
diff --git a/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql b/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
index 4da7cbe2a54..66ec0689111 100644
--- a/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
+++ b/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
@@ -16,7 +16,7 @@
 
 import javascript
 
-from PackageJSON pack, JSONString val
+from PackageJson pack, JsonString val
 where
   [pack.getDependencies(), pack.getDevDependencies()].getPropValue(_) = val and
   val.getValue().regexpMatch("(http|ftp)://.*")
diff --git a/javascript/ql/src/Security/CWE-347/MissingJWTKeyVerification.ql b/javascript/ql/src/Security/CWE-347/MissingJWTKeyVerification.ql
index b19dba1ce11..8d512777a00 100644
--- a/javascript/ql/src/Security/CWE-347/MissingJWTKeyVerification.ql
+++ b/javascript/ql/src/Security/CWE-347/MissingJWTKeyVerification.ql
@@ -3,6 +3,7 @@
  * @description The application does not verify the JWT payload with a cryptographic secret or public key.
  * @kind problem
  * @problem.severity warning
+ * @security-severity 7.0
  * @precision high
  * @id js/jwt-missing-verification
  * @tags security
diff --git a/javascript/ql/src/Security/CWE-730/ServerCrash.ql b/javascript/ql/src/Security/CWE-730/ServerCrash.ql
index eb8a6ac3cb5..f5de58d4516 100644
--- a/javascript/ql/src/Security/CWE-730/ServerCrash.ql
+++ b/javascript/ql/src/Security/CWE-730/ServerCrash.ql
@@ -130,7 +130,7 @@ class AsyncCallback extends Function {
  *
  * This is the primary extension point for this query.
  */
-abstract class LikelyExceptionThrower extends ASTNode { }
+abstract class LikelyExceptionThrower extends AstNode { }
 
 /**
  * A `throw` statement.
@@ -152,7 +152,7 @@ class CompilerConfusingExceptionThrower extends LikelyExceptionThrower {
  * - step 3. exception follows the call graph backwards until an async callee is encountered
  * - step 4. (at this point, the program crashes)
  */
-query predicate edges(ASTNode pred, ASTNode succ) {
+query predicate edges(AstNode pred, AstNode succ) {
   exists(LikelyExceptionThrower thrower | main(_, _, _, thrower) |
     pred = thrower and
     succ = thrower.getContainer()
@@ -174,7 +174,7 @@ query predicate edges(ASTNode pred, ASTNode succ) {
 /**
  * Holds if `node` is in the `edge/2` relation above.
  */
-query predicate nodes(ASTNode node) {
+query predicate nodes(AstNode node) {
   edges(node, _) or
   edges(_, node)
 }
diff --git a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
index 08928946eb5..ea5f2fb9755 100644
--- a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
+++ b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
@@ -49,7 +49,7 @@ predicate benignContext(Expr e) {
   e.getParent().(ExprStmt).getParent() instanceof CodeInAttribute
   or
   // and JSX-attributes.
-  e = any(JSXAttribute attr).getValue()
+  e = any(JsxAttribute attr).getValue()
   or
   exists(AwaitExpr await | await.getOperand() = e and benignContext(await))
   or
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
index 57adc2ed06e..600fff5fb1c 100644
--- a/javascript/ql/src/Statements/UselessConditional.ql
+++ b/javascript/ql/src/Statements/UselessConditional.ql
@@ -139,12 +139,12 @@ predicate whitelist(Expr e) {
  * The return value of `e` may have other uses besides the truthiness check,
  * but if the truthiness check always goes one way, it still indicates an error.
  */
-predicate isConditional(ASTNode cond, Expr e) {
+predicate isConditional(AstNode cond, Expr e) {
   isExplicitConditional(cond, e) or
   e = cond.(LogicalBinaryExpr).getLeftOperand()
 }
 
-from ASTNode cond, DataFlow::AnalyzedNode op, boolean cv, ASTNode sel, string msg
+from AstNode cond, DataFlow::AnalyzedNode op, boolean cv, AstNode sel, string msg
 where
   isConditional(cond, op.asExpr()) and
   cv = op.getTheBooleanValue() and
diff --git a/javascript/ql/src/Statements/UselessConditional.qll b/javascript/ql/src/Statements/UselessConditional.qll
index 9197a2b8a0f..17fff876184 100644
--- a/javascript/ql/src/Statements/UselessConditional.qll
+++ b/javascript/ql/src/Statements/UselessConditional.qll
@@ -9,7 +9,7 @@ import javascript
  * `e` and checks its value for truthiness, and the return value of `e`
  * is not used for anything other than this truthiness check.
  */
-predicate isExplicitConditional(ASTNode cond, Expr e) {
+predicate isExplicitConditional(AstNode cond, Expr e) {
   e = cond.(IfStmt).getCondition()
   or
   e = cond.(LoopStmt).getTest()
diff --git a/javascript/ql/src/change-notes/released/0.0.12.md b/javascript/ql/src/change-notes/released/0.0.12.md
new file mode 100644
index 00000000000..a8e2f0b468e
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/0.0.12.md
@@ -0,0 +1 @@
+## 0.0.12
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index e679dc42092..997fb8da83c 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.11
+lastReleaseVersion: 0.0.12
diff --git a/javascript/ql/src/definitions.ql b/javascript/ql/src/definitions.ql
index a87857415e6..e4a730062e2 100644
--- a/javascript/ql/src/definitions.ql
+++ b/javascript/ql/src/definitions.ql
@@ -8,6 +8,6 @@
 
 import definitions
 
-from Locatable e, ASTNode def, string kind
+from Locatable e, AstNode def, string kind
 where def = definitionOf(e, kind)
 select e, def, kind
diff --git a/javascript/ql/src/definitions.qll b/javascript/ql/src/definitions.qll
index ecba34d6d16..4d0c0d50176 100644
--- a/javascript/ql/src/definitions.qll
+++ b/javascript/ql/src/definitions.qll
@@ -25,7 +25,7 @@ private string refKind(RefExpr r) {
 /**
  * Gets a class, function or object literal `va` may refer to.
  */
-private ASTNode lookupDef(VarAccess va) {
+private AstNode lookupDef(VarAccess va) {
   exists(AbstractValue av | av = va.analyze().getAValue() |
     result = av.(AbstractClass).getClass() or
     result = av.(AbstractFunction).getFunction() or
@@ -37,7 +37,7 @@ private ASTNode lookupDef(VarAccess va) {
  * Holds if `va` is of kind `kind` and `def` is the unique class,
  * function or object literal it refers to.
  */
-private predicate variableDefLookup(VarAccess va, ASTNode def, string kind) {
+private predicate variableDefLookup(VarAccess va, AstNode def, string kind) {
   count(lookupDef(va)) = 1 and
   def = lookupDef(va) and
   kind = refKind(va)
@@ -66,7 +66,7 @@ private predicate variableDeclLookup(VarAccess va, VarDecl decl, string kind) {
  * For example, in the statement `var a = require("./a")`, the path expression
  * `"./a"` imports a module `a` in the same folder.
  */
-private predicate importLookup(ASTNode path, Module target, string kind) {
+private predicate importLookup(AstNode path, Module target, string kind) {
   kind = "I" and
   (
     exists(Import i |
@@ -84,7 +84,7 @@ private predicate importLookup(ASTNode path, Module target, string kind) {
 /**
  * Gets a node that may write the property read by `prn`.
  */
-private ASTNode getAWrite(DataFlow::PropRead prn) {
+private AstNode getAWrite(DataFlow::PropRead prn) {
   exists(DataFlow::AnalyzedNode base, DefiniteAbstractValue baseVal, string propName |
     base = prn.getBase() and
     propName = prn.getPropertyName() and
@@ -112,7 +112,7 @@ private ASTNode getAWrite(DataFlow::PropRead prn) {
  * only such property write. Parameter `kind` is always bound to `"M"`
  * at the moment.
  */
-private predicate propertyLookup(Expr prop, ASTNode write, string kind) {
+private predicate propertyLookup(Expr prop, AstNode write, string kind) {
   exists(DataFlow::PropRead prn | prop = prn.getPropertyNameExpr() |
     count(getAWrite(prn)) = 1 and
     write = getAWrite(prn) and
@@ -123,7 +123,7 @@ private predicate propertyLookup(Expr prop, ASTNode write, string kind) {
 /**
  * Holds if `ref` is an identifier that refers to a type declared at `decl`.
  */
-private predicate typeLookup(ASTNode ref, ASTNode decl, string kind) {
+private predicate typeLookup(AstNode ref, AstNode decl, string kind) {
   exists(TypeAccess typeAccess |
     ref = typeAccess.getIdentifier() and
     decl = typeAccess.getTypeName().getADefinition() and
@@ -134,7 +134,7 @@ private predicate typeLookup(ASTNode ref, ASTNode decl, string kind) {
 /**
  * Holds if `ref` is the callee name of an invocation of `decl`.
  */
-private predicate typedInvokeLookup(ASTNode ref, ASTNode decl, string kind) {
+private predicate typedInvokeLookup(AstNode ref, AstNode decl, string kind) {
   not variableDefLookup(ref, decl, _) and
   not propertyLookup(ref, decl, _) and
   exists(InvokeExpr invoke, Expr callee |
@@ -148,7 +148,7 @@ private predicate typedInvokeLookup(ASTNode ref, ASTNode decl, string kind) {
 /**
  * Holds if `ref` is a JSDoc type annotation referring to a class defined at `decl`.
  */
-private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, ASTNode decl, string kind) {
+private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, AstNode decl, string kind) {
   decl = ref.getClass().getAstNode() and
   kind = "T"
 }
@@ -163,7 +163,7 @@ private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, ASTNode decl, string k
  *  - `"I"` for imports
  */
 cached
-ASTNode definitionOf(Locatable e, string kind) {
+AstNode definitionOf(Locatable e, string kind) {
   variableDefLookup(e, result, kind)
   or
   // prefer definitions over declarations
diff --git a/javascript/ql/src/experimental/Summaries/ImportFromExternalPredicates.qll b/javascript/ql/src/experimental/Summaries/ImportFromExternalPredicates.qll
index 8f67f1508cd..728a8244f1d 100644
--- a/javascript/ql/src/experimental/Summaries/ImportFromExternalPredicates.qll
+++ b/javascript/ql/src/experimental/Summaries/ImportFromExternalPredicates.qll
@@ -35,13 +35,14 @@ external predicate additionalSteps(
  * An additional source specified through the `additionalSources` predicate.
  */
 private class AdditionalSourceFromSpec extends DataFlow::AdditionalSource {
-  Portal portal;
   string flowLabel;
   string config;
 
   AdditionalSourceFromSpec() {
-    additionalSources(portal.toString(), flowLabel, config) and
-    this = portal.getAnExitNode(_)
+    exists(Portal portal |
+      additionalSources(portal.toString(), flowLabel, config) and
+      this = portal.getAnExitNode(_)
+    )
   }
 
   override predicate isSourceFor(DataFlow::Configuration cfg, DataFlow::FlowLabel lbl) {
@@ -53,13 +54,14 @@ private class AdditionalSourceFromSpec extends DataFlow::AdditionalSource {
  * An additional sink specified through the `additionalSinks` predicate.
  */
 private class AdditionalSinkFromSpec extends DataFlow::AdditionalSink {
-  Portal portal;
   string flowLabel;
   string config;
 
   AdditionalSinkFromSpec() {
-    additionalSinks(portal.toString(), flowLabel, config) and
-    this = portal.getAnEntryNode(_)
+    exists(Portal portal |
+      additionalSinks(portal.toString(), flowLabel, config) and
+      this = portal.getAnEntryNode(_)
+    )
   }
 
   override predicate isSinkFor(DataFlow::Configuration cfg, DataFlow::FlowLabel lbl) {
diff --git a/javascript/ql/src/experimental/semmle/javascript/security/dataflow/ResourceExhaustion.qll b/javascript/ql/src/experimental/semmle/javascript/security/dataflow/ResourceExhaustion.qll
index 582df0ee071..c77ce32efbd 100644
--- a/javascript/ql/src/experimental/semmle/javascript/security/dataflow/ResourceExhaustion.qll
+++ b/javascript/ql/src/experimental/semmle/javascript/security/dataflow/ResourceExhaustion.qll
@@ -23,6 +23,11 @@ module ResourceExhaustion {
 
     override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
+    override predicate isSanitizer(DataFlow::Node node) {
+      super.isSanitizer(node) or
+      node instanceof Sanitizer
+    }
+
     override predicate isAdditionalTaintStep(DataFlow::Node src, DataFlow::Node dst) {
       isNumericFlowStep(src, dst)
       or
diff --git a/javascript/ql/src/localDefinitions.ql b/javascript/ql/src/localDefinitions.ql
index a3794b3cce6..289679d42ff 100644
--- a/javascript/ql/src/localDefinitions.ql
+++ b/javascript/ql/src/localDefinitions.ql
@@ -11,6 +11,6 @@ import definitions
 
 external string selectedSourceFile();
 
-from Locatable e, ASTNode def, string kind
+from Locatable e, AstNode def, string kind
 where def = definitionOf(e, kind) and e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
 select e, def, kind
diff --git a/javascript/ql/src/localReferences.ql b/javascript/ql/src/localReferences.ql
index 796fc473356..e9dc4e4a954 100644
--- a/javascript/ql/src/localReferences.ql
+++ b/javascript/ql/src/localReferences.ql
@@ -11,7 +11,7 @@ import definitions
 
 external string selectedSourceFile();
 
-from Locatable e, ASTNode def, string kind
+from Locatable e, AstNode def, string kind
 where
   def = definitionOf(e, kind) and def.getFile() = getFileBySourceArchiveName(selectedSourceFile())
 select e, def, kind
diff --git a/javascript/ql/src/meta/Consistency.ql b/javascript/ql/src/meta/Consistency.ql
index 3e2ec0c412a..ae157f3897b 100644
--- a/javascript/ql/src/meta/Consistency.ql
+++ b/javascript/ql/src/meta/Consistency.ql
@@ -24,7 +24,7 @@ predicate exprWithoutEnclosingStmt(Expr e) {
   // Some expressions have non-expression parents that we want to skip over.
   exprWithoutEnclosingStmt(e.getParent().(Property).getObjectExpr()) or
   exprWithoutEnclosingStmt(e.getParent().(PropertyPattern).getObjectPattern()) or
-  exprWithoutEnclosingStmt(e.getParent().(JSXAttribute).getElement())
+  exprWithoutEnclosingStmt(e.getParent().(JsxAttribute).getElement())
 }
 
 /**
@@ -65,7 +65,7 @@ predicate ast_consistency(string clsname, string problem, string what) {
     not exists(l.getLocation()) and problem = "no location" and what = l.toString()
   )
   or
-  exists(ASTNode nd | clsname = nd.getAQlClass() |
+  exists(AstNode nd | clsname = nd.getAQlClass() |
     uniqueness_error(count(nd.getTopLevel()), "getTopLevel", problem) and
     what = "at " + nd.getLocation()
   )
@@ -120,7 +120,7 @@ predicate location_consistency(string clsname, string problem, string what) {
 /**
  * Holds if function or toplevel `sc` is expected to have an associated control flow graph.
  */
-predicate hasCFG(StmtContainer sc) { not exists(Error err | err.getFile() = sc.getFile()) }
+predicate hasCfg(StmtContainer sc) { not exists(Error err | err.getFile() = sc.getFile()) }
 
 /**
  * Holds if a contract involving the CFG structure is violated, where `clsname`
@@ -128,7 +128,7 @@ predicate hasCFG(StmtContainer sc) { not exists(Error err | err.getFile() = sc.g
  * the violation, and `what` gives location information.
  */
 predicate cfg_consistency(string clsname, string problem, string what) {
-  exists(StmtContainer cont | clsname = cont.getAQlClass() and hasCFG(cont) |
+  exists(StmtContainer cont | clsname = cont.getAQlClass() and hasCfg(cont) |
     uniqueness_error(count(cont.getEntry()), "getEntry", problem) and
     what = "at " + cont.getLocation()
     or
@@ -136,7 +136,7 @@ predicate cfg_consistency(string clsname, string problem, string what) {
     what = "at " + cont.getLocation()
   )
   or
-  exists(ASTNode nd | clsname = nd.getAQlClass() and hasCFG(nd.getTopLevel()) |
+  exists(AstNode nd | clsname = nd.getAQlClass() and hasCfg(nd.getTopLevel()) |
     uniqueness_error(count(nd.getFirstControlFlowNode()), "getFirstControlFlowNode", problem) and
     what = "at " + nd.getLocation()
   )
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index c5a820194ca..b72f7230ac9 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 0.0.12-dev
+version: 0.0.13-dev
 groups: 
   - javascript
   - queries
diff --git a/javascript/ql/test/library-tests/Classes/AccessorMethods.qll b/javascript/ql/test/library-tests/Classes/AccessorMethods.qll
deleted file mode 100644
index 32dca6cabc8..00000000000
--- a/javascript/ql/test/library-tests/Classes/AccessorMethods.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_AccessorMethods(AccessorMethodDefinition amd) { any() }
diff --git a/javascript/ql/test/library-tests/Classes/ClassDefinition_getName.qll b/javascript/ql/test/library-tests/Classes/ClassDefinition_getName.qll
deleted file mode 100644
index 0eb8bec773c..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassDefinition_getName.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_ClassDefinition_getName(ClassDefinition cd, string res) { res = cd.getName() }
diff --git a/javascript/ql/test/library-tests/Classes/ClassDefinition_getSuperClass.qll b/javascript/ql/test/library-tests/Classes/ClassDefinition_getSuperClass.qll
deleted file mode 100644
index 30bf54a496a..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassDefinition_getSuperClass.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_ClassDefinition_getSuperClass(ClassDefinition cd, Expr res) {
-  res = cd.getSuperClass()
-}
diff --git a/javascript/ql/test/library-tests/Classes/ClassDefinitions.qll b/javascript/ql/test/library-tests/Classes/ClassDefinitions.qll
deleted file mode 100644
index 94150fd65a1..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassDefinitions.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_ClassDefinitions(ClassDefinition cd) { any() }
diff --git a/javascript/ql/test/library-tests/Classes/ClassFlow.qll b/javascript/ql/test/library-tests/Classes/ClassFlow.qll
deleted file mode 100644
index dec2475702c..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassFlow.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-import javascript
-
-class Configuration extends DataFlow::Configuration {
-  Configuration() { this = "ClassDataFlowTestingConfig" }
-
-  override predicate isSource(DataFlow::Node source) {
-    source.getEnclosingExpr().(StringLiteral).getValue().toLowerCase() = "source"
-  }
-
-  override predicate isSink(DataFlow::Node sink) {
-    any(DataFlow::CallNode call | call.getCalleeName() = "sink").getAnArgument() = sink
-  }
-}
-
-query predicate dataflow(DataFlow::Node pred, DataFlow::Node succ) {
-  any(Configuration c).hasFlow(pred, succ)
-}
diff --git a/javascript/ql/test/library-tests/Classes/ClassNodeConstructor.qll b/javascript/ql/test/library-tests/Classes/ClassNodeConstructor.qll
deleted file mode 100644
index da1abf434c9..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassNodeConstructor.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_ClassNodeConstructor(DataFlow::ClassNode class_, DataFlow::FunctionNode res) {
-  res = class_.getConstructor()
-}
diff --git a/javascript/ql/test/library-tests/Classes/ClassNodeInstanceMethod.qll b/javascript/ql/test/library-tests/Classes/ClassNodeInstanceMethod.qll
deleted file mode 100644
index a631a7b1168..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassNodeInstanceMethod.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import javascript
-
-query predicate test_ClassNodeInstanceMethod(
-  DataFlow::ClassNode class_, string name, DataFlow::FunctionNode res
-) {
-  res = class_.getInstanceMethod(name)
-}
diff --git a/javascript/ql/test/library-tests/Classes/ClassNodeStaticMethod.qll b/javascript/ql/test/library-tests/Classes/ClassNodeStaticMethod.qll
deleted file mode 100644
index cdfd7e0617a..00000000000
--- a/javascript/ql/test/library-tests/Classes/ClassNodeStaticMethod.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import javascript
-
-query predicate test_ClassNodeStaticMethod(
-  DataFlow::ClassNode class_, string name, DataFlow::FunctionNode res
-) {
-  res = class_.getStaticMethod(name)
-}
diff --git a/javascript/ql/test/library-tests/Classes/ComputedMethods.qll b/javascript/ql/test/library-tests/Classes/ComputedMethods.qll
deleted file mode 100644
index 19087903766..00000000000
--- a/javascript/ql/test/library-tests/Classes/ComputedMethods.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_ComputedMethods(MethodDefinition md) { md.isComputed() }
diff --git a/javascript/ql/test/library-tests/Classes/ConstructorDefinitions.qll b/javascript/ql/test/library-tests/Classes/ConstructorDefinitions.qll
deleted file mode 100644
index e4478cee98e..00000000000
--- a/javascript/ql/test/library-tests/Classes/ConstructorDefinitions.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_ConstructorDefinitions(ConstructorDefinition cd) { any() }
diff --git a/javascript/ql/test/library-tests/Classes/FieldInits.qll b/javascript/ql/test/library-tests/Classes/FieldInits.qll
deleted file mode 100644
index 5ea97665207..00000000000
--- a/javascript/ql/test/library-tests/Classes/FieldInits.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_FieldInits(FieldDefinition field, Expr res) { res = field.getInit() }
diff --git a/javascript/ql/test/library-tests/Classes/Fields.qll b/javascript/ql/test/library-tests/Classes/Fields.qll
deleted file mode 100644
index fcb73440a49..00000000000
--- a/javascript/ql/test/library-tests/Classes/Fields.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_Fields(FieldDefinition field, Expr res) { res = field.getNameExpr() }
diff --git a/javascript/ql/test/library-tests/Classes/MethodDefinitions.qll b/javascript/ql/test/library-tests/Classes/MethodDefinitions.qll
deleted file mode 100644
index 89a93217160..00000000000
--- a/javascript/ql/test/library-tests/Classes/MethodDefinitions.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import javascript
-
-query predicate test_MethodDefinitions(
-  MethodDefinition md, Expr res0, FunctionExpr res1, ClassDefinition res2
-) {
-  res0 = md.getNameExpr() and res1 = md.getBody() and res2 = md.getDeclaringClass()
-}
diff --git a/javascript/ql/test/library-tests/Classes/MethodNames.qll b/javascript/ql/test/library-tests/Classes/MethodNames.qll
deleted file mode 100644
index d956696ac71..00000000000
--- a/javascript/ql/test/library-tests/Classes/MethodNames.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_MethodNames(MethodDefinition md, string res) { res = md.getName() }
diff --git a/javascript/ql/test/library-tests/Classes/NewTargetExpr.qll b/javascript/ql/test/library-tests/Classes/NewTargetExpr.qll
deleted file mode 100644
index ea35cb80d11..00000000000
--- a/javascript/ql/test/library-tests/Classes/NewTargetExpr.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_NewTargetExpr(NewTargetExpr e) { any() }
diff --git a/javascript/ql/test/library-tests/Classes/PrivateField.qll b/javascript/ql/test/library-tests/Classes/PrivateField.qll
deleted file mode 100644
index d4f5d3d4678..00000000000
--- a/javascript/ql/test/library-tests/Classes/PrivateField.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import javascript
-
-query string getAccessModifier(DataFlow::PropRef ref, Expr prop) {
-  prop = ref.getPropertyNameExpr() and
-  if ref.isPrivateField() then result = "Private" else result = "Public"
-}
diff --git a/javascript/ql/test/library-tests/Classes/StaticMethods.qll b/javascript/ql/test/library-tests/Classes/StaticMethods.qll
deleted file mode 100644
index ba0f01f54d7..00000000000
--- a/javascript/ql/test/library-tests/Classes/StaticMethods.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_StaticMethods(MethodDefinition md) { md.isStatic() }
diff --git a/javascript/ql/test/library-tests/Classes/SuperExpr.qll b/javascript/ql/test/library-tests/Classes/SuperExpr.qll
deleted file mode 100644
index b5ca8b95073..00000000000
--- a/javascript/ql/test/library-tests/Classes/SuperExpr.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_SuperExpr(SuperExpr s) { any() }
diff --git a/javascript/ql/test/library-tests/Classes/SyntheticConstructors.qll b/javascript/ql/test/library-tests/Classes/SyntheticConstructors.qll
deleted file mode 100644
index 2f379fe8af1..00000000000
--- a/javascript/ql/test/library-tests/Classes/SyntheticConstructors.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_SyntheticConstructors(ConstructorDefinition cd) { cd.isSynthetic() }
diff --git a/javascript/ql/test/library-tests/Classes/getAMember.qll b/javascript/ql/test/library-tests/Classes/getAMember.qll
deleted file mode 100644
index 0ba3084bcd8..00000000000
--- a/javascript/ql/test/library-tests/Classes/getAMember.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_getAMember(ClassDefinition c, MemberDeclaration res) { res = c.getAMember() }
diff --git a/javascript/ql/test/library-tests/CustomAbstractValueDefinitions/CustomAbstractValueDefinitionsFlow.ql b/javascript/ql/test/library-tests/CustomAbstractValueDefinitions/CustomAbstractValueDefinitionsFlow.ql
index 203526e4069..0308ad6bf45 100644
--- a/javascript/ql/test/library-tests/CustomAbstractValueDefinitions/CustomAbstractValueDefinitionsFlow.ql
+++ b/javascript/ql/test/library-tests/CustomAbstractValueDefinitions/CustomAbstractValueDefinitionsFlow.ql
@@ -2,14 +2,11 @@ import javascript
 import semmle.javascript.dataflow.InferredTypes
 import semmle.javascript.dataflow.CustomAbstractValueDefinitions
 
-class MyCustomAbstractValueDefinition extends CustomAbstractValueDefinition {
-  DataFlow::ValueNode node;
-
+class MyCustomAbstractValueDefinition extends CustomAbstractValueDefinition, AST::ValueNode {
   MyCustomAbstractValueDefinition() {
-    DataFlow::valueNode(this) = node and
-    node instanceof DataFlow::ObjectLiteralNode and
+    this.flow() instanceof DataFlow::ObjectLiteralNode and
     exists(DataFlow::PropWrite pwn |
-      pwn.writes(node, "custom", any(BooleanLiteral l | l.getValue() = "true").flow())
+      pwn.writes(this.flow(), "custom", any(BooleanLiteral l | l.getValue() = "true").flow())
     )
   }
 
diff --git a/javascript/ql/test/library-tests/DefUse/DefUsePair.expected b/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
index 6712137f691..caaf440a778 100644
--- a/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
+++ b/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
@@ -1,35 +1,30 @@
-| classes.js:1:1:2:1 | class Foo {\\n} | classes.js:4:1:4:3 | Foo |
-| classes.js:7:5:8:5 | class L ... {\\n    } | classes.js:10:5:10:12 | LocalFoo |
-| es2015.js:1:10:1:11 | fn | es2015.js:2:3:2:4 | fn |
-| es2015.js:5:16:5:16 | i | es2015.js:5:32:5:32 | i |
-| es2015.js:5:16:5:16 | i | es2015.js:5:34:5:34 | i |
-| es2015modules.js:1:10:1:12 | foo | es2015modules.js:4:3:4:5 | foo |
-| es2015modules.js:1:15:1:24 | bar as baz | es2015modules.js:6:3:6:5 | baz |
-| es2015modules.js:10:10:10:13 | quux | es2015modules.js:7:3:7:6 | quux |
-| es2015modules.js:15:17:15:17 | f | es2015modules.js:12:1:12:1 | f |
-| es2015modules.js:16:25:16:25 | g | es2015modules.js:13:1:13:1 | g |
-| fundecls.js:3:12:3:12 | f | fundecls.js:4:3:4:3 | f |
-| fundecls.js:9:10:9:10 | s | fundecls.js:7:1:7:1 | s |
-| fundecls.js:12:12:12:12 | f | fundecls.js:10:3:10:3 | f |
-| fundecls.js:18:12:18:12 | f | fundecls.js:17:3:17:3 | f |
-| fundecls.js:23:12:23:12 | f | fundecls.js:24:3:24:3 | f |
-| fundecls.js:34:12:34:12 | f | fundecls.js:35:3:35:3 | f |
-| fundecls.js:39:11:39:11 | x | fundecls.js:40:7:40:7 | x |
-| fundecls.js:41:14:41:14 | f | fundecls.js:45:3:45:3 | f |
-| fundecls.js:43:14:43:14 | f | fundecls.js:45:3:45:3 | f |
-| fundecls.js:48:11:48:11 | x | fundecls.js:50:7:50:7 | x |
-| tst.js:1:12:1:12 | o | tst.js:3:12:3:12 | o |
-| tst.js:1:12:1:12 | o | tst.js:5:16:5:16 | o |
-| tst.js:2:9:2:14 | y = 23 | tst.js:8:17:8:17 | y |
-| tst.js:2:17:2:21 | i = 0 | tst.js:4:5:4:5 | i |
-| tst.js:2:17:2:21 | i = 0 | tst.js:7:6:7:6 | i |
-| tst.js:4:3:4:5 | ++i | tst.js:4:5:4:5 | i |
-| tst.js:4:3:4:5 | ++i | tst.js:7:6:7:6 | i |
-| tst.js:5:11:5:11 | z | tst.js:6:7:6:7 | z |
-| tst.js:5:11:5:11 | z | tst.js:8:14:8:14 | z |
-| tst.js:7:4:7:6 | --i | tst.js:7:6:7:6 | i |
-| tst.js:12:2:12:7 | x = 42 | tst.js:14:9:14:9 | x |
-| tst.js:19:11:19:11 | x | tst.js:18:9:18:9 | x |
-| tst.js:23:6:23:23 | {a = b, c = d} = e | tst.js:24:2:24:2 | a |
-| tst.js:23:6:23:23 | {a = b, c = d} = e | tst.js:24:6:24:6 | c |
-| tst.js:26:11:26:11 | a | tst.js:27:2:27:2 | a |
+| classes.js:7:5:8:5 | def@7:5 | classes.js:10:5:10:12 | LocalFoo |
+| es2015.js:1:10:1:11 | def@1:10 | es2015.js:2:3:2:4 | fn |
+| es2015.js:5:16:5:16 | def@5:16 | es2015.js:5:32:5:32 | i |
+| es2015.js:5:16:5:16 | def@5:16 | es2015.js:5:34:5:34 | i |
+| es2015modules.js:1:10:1:12 | def@1:10 | es2015modules.js:4:3:4:5 | foo |
+| es2015modules.js:1:15:1:24 | def@1:15 | es2015modules.js:6:3:6:5 | baz |
+| es2015modules.js:10:10:10:13 | def@10:10 | es2015modules.js:7:3:7:6 | quux |
+| es2015modules.js:15:17:15:17 | def@15:17 | es2015modules.js:12:1:12:1 | f |
+| es2015modules.js:16:25:16:25 | def@16:25 | es2015modules.js:13:1:13:1 | g |
+| fundecls.js:3:12:3:12 | def@3:12 | fundecls.js:4:3:4:3 | f |
+| fundecls.js:12:12:12:12 | def@12:12 | fundecls.js:10:3:10:3 | f |
+| fundecls.js:18:12:18:12 | def@18:12 | fundecls.js:17:3:17:3 | f |
+| fundecls.js:23:12:23:12 | def@23:12 | fundecls.js:24:3:24:3 | f |
+| fundecls.js:27:2:27:2 | implicitInit@27:2 | fundecls.js:28:3:28:3 | f |
+| fundecls.js:34:12:34:12 | def@34:12 | fundecls.js:35:3:35:3 | f |
+| fundecls.js:39:11:39:11 | def@39:11 | fundecls.js:40:7:40:7 | x |
+| fundecls.js:45:3:45:3 | phi@45:3 | fundecls.js:45:3:45:3 | f |
+| fundecls.js:48:11:48:11 | def@48:11 | fundecls.js:50:7:50:7 | x |
+| tst.js:1:12:1:12 | def@1:12 | tst.js:3:12:3:12 | o |
+| tst.js:1:12:1:12 | def@1:12 | tst.js:5:16:5:16 | o |
+| tst.js:2:9:2:14 | def@2:9 | tst.js:8:17:8:17 | y |
+| tst.js:3:2:3:2 | phi@3:2 | tst.js:4:5:4:5 | i |
+| tst.js:5:2:5:2 | phi@5:2 | tst.js:7:6:7:6 | i |
+| tst.js:5:2:5:2 | phi@5:2 | tst.js:8:14:8:14 | z |
+| tst.js:5:11:5:11 | def@5:11 | tst.js:6:7:6:7 | z |
+| tst.js:12:2:12:7 | def@12:2 | tst.js:14:9:14:9 | x |
+| tst.js:19:11:19:11 | def@19:11 | tst.js:18:9:18:9 | x |
+| tst.js:23:6:23:23 | def@23:6 | tst.js:24:2:24:2 | a |
+| tst.js:23:6:23:23 | def@23:6 | tst.js:24:6:24:6 | c |
+| tst.js:26:11:26:11 | def@26:11 | tst.js:27:2:27:2 | a |
diff --git a/javascript/ql/test/library-tests/DefUse/DefUsePair.ql b/javascript/ql/test/library-tests/DefUse/DefUsePair.ql
index bf1ce96f8b9..ae5dff0de31 100644
--- a/javascript/ql/test/library-tests/DefUse/DefUsePair.ql
+++ b/javascript/ql/test/library-tests/DefUse/DefUsePair.ql
@@ -1,5 +1,5 @@
 import javascript
 
-from VarDef def, VarUse use
-where definitionReaches(_, def, use)
+from SsaVariable def, VarUse use
+where def.getAUse() = use
 select def, use
diff --git a/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql b/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql
index b004501c617..4401e852644 100644
--- a/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql
+++ b/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql
@@ -1,5 +1,5 @@
 import Metrics.ES20xxFeatures
 
-from ASTNode nd, int version, string category
+from AstNode nd, int version, string category
 where isES20xxFeature(nd, version, category)
 select nd, version, category
diff --git a/javascript/ql/test/library-tests/Expr/getParent.qll b/javascript/ql/test/library-tests/Expr/getParent.qll
index c37c9db3917..c0866fae586 100644
--- a/javascript/ql/test/library-tests/Expr/getParent.qll
+++ b/javascript/ql/test/library-tests/Expr/getParent.qll
@@ -1,3 +1,3 @@
 import javascript
 
-query predicate test_getParent(Expr e, ASTNode res) { res = e.getParent() }
+query predicate test_getParent(Expr e, AstNode res) { res = e.getParent() }
diff --git a/javascript/ql/test/library-tests/Externs/tests.ql b/javascript/ql/test/library-tests/Externs/tests.ql
index 6b722a8232c..7f95dcf42b8 100644
--- a/javascript/ql/test/library-tests/Externs/tests.ql
+++ b/javascript/ql/test/library-tests/Externs/tests.ql
@@ -10,7 +10,7 @@ query predicate externalDecl(ExternalDecl decl) { any() }
 
 query predicate externalTypedef(ExternalTypedef typ) { any() }
 
-query predicate externalVarDecl_getInit(ExternalVarDecl decl, ASTNode init) {
+query predicate externalVarDecl_getInit(ExternalVarDecl decl, AstNode init) {
   decl.getInit() = init
 }
 
diff --git a/javascript/ql/test/library-tests/JSON/JSONError.ql b/javascript/ql/test/library-tests/JSON/JSONError.ql
index d67bfa15856..21be6e1d536 100644
--- a/javascript/ql/test/library-tests/JSON/JSONError.ql
+++ b/javascript/ql/test/library-tests/JSON/JSONError.ql
@@ -1,4 +1,4 @@
 import semmle.javascript.JSON
 
-from JSONParseError jpe
+from JsonParseError jpe
 select jpe
diff --git a/javascript/ql/test/library-tests/JSON/JSONObject.ql b/javascript/ql/test/library-tests/JSON/JSONObject.ql
index 941e96b9d47..383ad19e414 100644
--- a/javascript/ql/test/library-tests/JSON/JSONObject.ql
+++ b/javascript/ql/test/library-tests/JSON/JSONObject.ql
@@ -1,6 +1,6 @@
 import semmle.javascript.JSON
 
-from JSONObject obj, string prop, JSONValue val, string strval
+from JsonObject obj, string prop, JsonValue val, string strval
 where
   val = obj.getPropValue(prop) and
   (
diff --git a/javascript/ql/test/library-tests/JSON/JSONValue.ql b/javascript/ql/test/library-tests/JSON/JSONValue.ql
index 9ea6bcd26e1..91ba2a14f27 100644
--- a/javascript/ql/test/library-tests/JSON/JSONValue.ql
+++ b/javascript/ql/test/library-tests/JSON/JSONValue.ql
@@ -1,4 +1,4 @@
 import semmle.javascript.JSON
 
-from JSONValue v
+from JsonValue v
 select v
diff --git a/javascript/ql/test/library-tests/JSON/printAst.expected b/javascript/ql/test/library-tests/JSON/printAst.expected
index 557f63a0b74..49b2498c95d 100644
--- a/javascript/ql/test/library-tests/JSON/printAst.expected
+++ b/javascript/ql/test/library-tests/JSON/printAst.expected
@@ -1,44 +1,44 @@
 nodes
-| invalid.json:1:1:1:4 | [JSONString] "hi" | semmle.label | [JSONString] "hi" |
-| invalid.json:1:1:1:4 | [JSONString] "hi" | semmle.order | 1 |
-| tst.json:1:1:15:2 | [JSONArray] [{name: ...}, ...] | semmle.label | [JSONArray] [{name: ...}, ...] |
-| tst.json:1:1:15:2 | [JSONArray] [{name: ...}, ...] | semmle.order | 2 |
-| tst.json:1:2:8:1 | [JSONObject] {name: ...} | semmle.label | [JSONObject] {name: ...} |
-| tst.json:2:11:2:21 | [JSONString] "Jim Knopf" | semmle.label | [JSONString] "Jim Knopf" |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | semmle.label | [JSONObject] {street: ...} |
-| tst.json:4:15:4:18 | [JSONNull] null | semmle.label | [JSONNull] null |
-| tst.json:5:15:5:16 | [JSONNumber] -1 | semmle.label | [JSONNumber] -1 |
-| tst.json:6:16:6:27 | [JSONString] "Lummerland" | semmle.label | [JSONString] "Lummerland" |
-| tst.json:8:4:15:1 | [JSONObject] {name: ...} | semmle.label | [JSONObject] {name: ...} |
-| tst.json:9:11:9:25 | [JSONString] "Frau Mahlzahn" | semmle.label | [JSONString] "Frau Mahlzahn" |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | semmle.label | [JSONObject] {street: ...} |
-| tst.json:11:15:11:28 | [JSONString] "Alte Strasse" | semmle.label | [JSONString] "Alte Strasse" |
-| tst.json:12:15:12:17 | [JSONNumber] 133 | semmle.label | [JSONNumber] 133 |
-| tst.json:13:16:13:27 | [JSONString] "Kummerland" | semmle.label | [JSONString] "Kummerland" |
+| invalid.json:1:1:1:4 | [JsonString] "hi" | semmle.label | [JsonString] "hi" |
+| invalid.json:1:1:1:4 | [JsonString] "hi" | semmle.order | 1 |
+| tst.json:1:1:15:2 | [JsonArray] [{name: ...}, ...] | semmle.label | [JsonArray] [{name: ...}, ...] |
+| tst.json:1:1:15:2 | [JsonArray] [{name: ...}, ...] | semmle.order | 2 |
+| tst.json:1:2:8:1 | [JsonObject] {name: ...} | semmle.label | [JsonObject] {name: ...} |
+| tst.json:2:11:2:21 | [JsonString] "Jim Knopf" | semmle.label | [JsonString] "Jim Knopf" |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | semmle.label | [JsonObject] {street: ...} |
+| tst.json:4:15:4:18 | [JsonNull] null | semmle.label | [JsonNull] null |
+| tst.json:5:15:5:16 | [JsonNumber] -1 | semmle.label | [JsonNumber] -1 |
+| tst.json:6:16:6:27 | [JsonString] "Lummerland" | semmle.label | [JsonString] "Lummerland" |
+| tst.json:8:4:15:1 | [JsonObject] {name: ...} | semmle.label | [JsonObject] {name: ...} |
+| tst.json:9:11:9:25 | [JsonString] "Frau Mahlzahn" | semmle.label | [JsonString] "Frau Mahlzahn" |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | semmle.label | [JsonObject] {street: ...} |
+| tst.json:11:15:11:28 | [JsonString] "Alte Strasse" | semmle.label | [JsonString] "Alte Strasse" |
+| tst.json:12:15:12:17 | [JsonNumber] 133 | semmle.label | [JsonNumber] 133 |
+| tst.json:13:16:13:27 | [JsonString] "Kummerland" | semmle.label | [JsonString] "Kummerland" |
 edges
-| tst.json:1:1:15:2 | [JSONArray] [{name: ...}, ...] | tst.json:1:2:8:1 | [JSONObject] {name: ...} | semmle.label | 0 |
-| tst.json:1:1:15:2 | [JSONArray] [{name: ...}, ...] | tst.json:1:2:8:1 | [JSONObject] {name: ...} | semmle.order | 0 |
-| tst.json:1:1:15:2 | [JSONArray] [{name: ...}, ...] | tst.json:8:4:15:1 | [JSONObject] {name: ...} | semmle.label | 1 |
-| tst.json:1:1:15:2 | [JSONArray] [{name: ...}, ...] | tst.json:8:4:15:1 | [JSONObject] {name: ...} | semmle.order | 1 |
-| tst.json:1:2:8:1 | [JSONObject] {name: ...} | tst.json:2:11:2:21 | [JSONString] "Jim Knopf" | semmle.label | 0 |
-| tst.json:1:2:8:1 | [JSONObject] {name: ...} | tst.json:2:11:2:21 | [JSONString] "Jim Knopf" | semmle.order | 0 |
-| tst.json:1:2:8:1 | [JSONObject] {name: ...} | tst.json:3:14:7:3 | [JSONObject] {street: ...} | semmle.label | 1 |
-| tst.json:1:2:8:1 | [JSONObject] {name: ...} | tst.json:3:14:7:3 | [JSONObject] {street: ...} | semmle.order | 1 |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | tst.json:4:15:4:18 | [JSONNull] null | semmle.label | 0 |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | tst.json:4:15:4:18 | [JSONNull] null | semmle.order | 0 |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | tst.json:5:15:5:16 | [JSONNumber] -1 | semmle.label | 1 |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | tst.json:5:15:5:16 | [JSONNumber] -1 | semmle.order | 1 |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | tst.json:6:16:6:27 | [JSONString] "Lummerland" | semmle.label | 2 |
-| tst.json:3:14:7:3 | [JSONObject] {street: ...} | tst.json:6:16:6:27 | [JSONString] "Lummerland" | semmle.order | 2 |
-| tst.json:8:4:15:1 | [JSONObject] {name: ...} | tst.json:9:11:9:25 | [JSONString] "Frau Mahlzahn" | semmle.label | 0 |
-| tst.json:8:4:15:1 | [JSONObject] {name: ...} | tst.json:9:11:9:25 | [JSONString] "Frau Mahlzahn" | semmle.order | 0 |
-| tst.json:8:4:15:1 | [JSONObject] {name: ...} | tst.json:10:14:14:3 | [JSONObject] {street: ...} | semmle.label | 1 |
-| tst.json:8:4:15:1 | [JSONObject] {name: ...} | tst.json:10:14:14:3 | [JSONObject] {street: ...} | semmle.order | 1 |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | tst.json:11:15:11:28 | [JSONString] "Alte Strasse" | semmle.label | 0 |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | tst.json:11:15:11:28 | [JSONString] "Alte Strasse" | semmle.order | 0 |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | tst.json:12:15:12:17 | [JSONNumber] 133 | semmle.label | 1 |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | tst.json:12:15:12:17 | [JSONNumber] 133 | semmle.order | 1 |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | tst.json:13:16:13:27 | [JSONString] "Kummerland" | semmle.label | 2 |
-| tst.json:10:14:14:3 | [JSONObject] {street: ...} | tst.json:13:16:13:27 | [JSONString] "Kummerland" | semmle.order | 2 |
+| tst.json:1:1:15:2 | [JsonArray] [{name: ...}, ...] | tst.json:1:2:8:1 | [JsonObject] {name: ...} | semmle.label | 0 |
+| tst.json:1:1:15:2 | [JsonArray] [{name: ...}, ...] | tst.json:1:2:8:1 | [JsonObject] {name: ...} | semmle.order | 0 |
+| tst.json:1:1:15:2 | [JsonArray] [{name: ...}, ...] | tst.json:8:4:15:1 | [JsonObject] {name: ...} | semmle.label | 1 |
+| tst.json:1:1:15:2 | [JsonArray] [{name: ...}, ...] | tst.json:8:4:15:1 | [JsonObject] {name: ...} | semmle.order | 1 |
+| tst.json:1:2:8:1 | [JsonObject] {name: ...} | tst.json:2:11:2:21 | [JsonString] "Jim Knopf" | semmle.label | 0 |
+| tst.json:1:2:8:1 | [JsonObject] {name: ...} | tst.json:2:11:2:21 | [JsonString] "Jim Knopf" | semmle.order | 0 |
+| tst.json:1:2:8:1 | [JsonObject] {name: ...} | tst.json:3:14:7:3 | [JsonObject] {street: ...} | semmle.label | 1 |
+| tst.json:1:2:8:1 | [JsonObject] {name: ...} | tst.json:3:14:7:3 | [JsonObject] {street: ...} | semmle.order | 1 |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | tst.json:4:15:4:18 | [JsonNull] null | semmle.label | 0 |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | tst.json:4:15:4:18 | [JsonNull] null | semmle.order | 0 |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | tst.json:5:15:5:16 | [JsonNumber] -1 | semmle.label | 1 |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | tst.json:5:15:5:16 | [JsonNumber] -1 | semmle.order | 1 |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | tst.json:6:16:6:27 | [JsonString] "Lummerland" | semmle.label | 2 |
+| tst.json:3:14:7:3 | [JsonObject] {street: ...} | tst.json:6:16:6:27 | [JsonString] "Lummerland" | semmle.order | 2 |
+| tst.json:8:4:15:1 | [JsonObject] {name: ...} | tst.json:9:11:9:25 | [JsonString] "Frau Mahlzahn" | semmle.label | 0 |
+| tst.json:8:4:15:1 | [JsonObject] {name: ...} | tst.json:9:11:9:25 | [JsonString] "Frau Mahlzahn" | semmle.order | 0 |
+| tst.json:8:4:15:1 | [JsonObject] {name: ...} | tst.json:10:14:14:3 | [JsonObject] {street: ...} | semmle.label | 1 |
+| tst.json:8:4:15:1 | [JsonObject] {name: ...} | tst.json:10:14:14:3 | [JsonObject] {street: ...} | semmle.order | 1 |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | tst.json:11:15:11:28 | [JsonString] "Alte Strasse" | semmle.label | 0 |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | tst.json:11:15:11:28 | [JsonString] "Alte Strasse" | semmle.order | 0 |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | tst.json:12:15:12:17 | [JsonNumber] 133 | semmle.label | 1 |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | tst.json:12:15:12:17 | [JsonNumber] 133 | semmle.order | 1 |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | tst.json:13:16:13:27 | [JsonString] "Kummerland" | semmle.label | 2 |
+| tst.json:10:14:14:3 | [JsonObject] {street: ...} | tst.json:13:16:13:27 | [JsonString] "Kummerland" | semmle.order | 2 |
 graphProperties
 | semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/JSX/printAst.expected b/javascript/ql/test/library-tests/JSX/printAst.expected
index 1600845f0d6..11bf254a890 100644
--- a/javascript/ql/test/library-tests/JSX/printAst.expected
+++ b/javascript/ql/test/library-tests/JSX/printAst.expected
@@ -20,37 +20,37 @@ nodes
 | tst.js:2:19:2:21 | [Label] rel | semmle.label | [Label] rel |
 | tst.js:2:19:2:44 | [Property] rel: "noopener noreferrer" | semmle.label | [Property] rel: "noopener noreferrer" |
 | tst.js:2:24:2:44 | [Literal] "noopener noreferrer" | semmle.label | [Literal] "noopener noreferrer" |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | semmle.label | [JSXElement] <a href ... */}</a> |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | semmle.label | [JsxElement] <a href ... */}</a> |
 | tst.js:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | semmle.label | [ExprStmt] <a href ... /}</a>; |
 | tst.js:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | semmle.order | 3 |
 | tst.js:3:2:3:2 | [Label] a | semmle.label | [Label] a |
 | tst.js:3:4:3:7 | [Label] href | semmle.label | [Label] href |
-| tst.js:3:4:3:14 | [JSXAttribute] href={href} | semmle.label | [JSXAttribute] href={href} |
+| tst.js:3:4:3:14 | [JsxAttribute] href={href} | semmle.label | [JsxAttribute] href={href} |
 | tst.js:3:10:3:13 | [VarRef] href | semmle.label | [VarRef] href |
 | tst.js:3:16:3:21 | [Label] target | semmle.label | [Label] target |
-| tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | semmle.label | [JSXAttribute] target="_blank" |
+| tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | semmle.label | [JsxAttribute] target="_blank" |
 | tst.js:3:23:3:30 | [Literal] "_blank" | semmle.label | [Literal] "_blank" |
-| tst.js:3:32:3:45 | [JSXAttribute] {...linkTypes} | semmle.label | [JSXAttribute] {...linkTypes} |
+| tst.js:3:32:3:45 | [JsxAttribute] {...linkTypes} | semmle.label | [JsxAttribute] {...linkTypes} |
 | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.label | [SpreadElement] ...linkTypes |
 | tst.js:3:36:3:44 | [VarRef] linkTypes | semmle.label | [VarRef] linkTypes |
 | tst.js:3:47:3:54 | [Literal] Link to  | semmle.label | [Literal] Link to  |
 | tst.js:3:56:3:59 | [VarRef] href | semmle.label | [VarRef] href |
 | tst.js:3:61:3:62 | [Literal] .  | semmle.label | [Literal] .  |
-| tst.js:3:64:3:101 | [JSXEmptyExpr]  | semmle.label | [JSXEmptyExpr]  |
-| tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | semmle.label | [JSXElement] <MyComp ... "bar"/> |
+| tst.js:3:64:3:101 | [JsxEmptyExpr]  | semmle.label | [JsxEmptyExpr]  |
+| tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | semmle.label | [JsxElement] <MyComp ... "bar"/> |
 | tst.js:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | semmle.label | [ExprStmt] <MyComp ... bar"/>; |
 | tst.js:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | semmle.order | 4 |
 | tst.js:4:2:4:13 | [VarRef] MyComponents | semmle.label | [VarRef] MyComponents |
 | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.label | [DotExpr] MyCompo ... ncyLink |
 | tst.js:4:15:4:23 | [Label] FancyLink | semmle.label | [Label] FancyLink |
 | tst.js:4:25:4:27 | [Label] foo | semmle.label | [Label] foo |
-| tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | semmle.label | [JSXAttribute] foo="bar" |
+| tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | semmle.label | [JsxAttribute] foo="bar" |
 | tst.js:4:29:4:33 | [Literal] "bar" | semmle.label | [Literal] "bar" |
-| tst.js:5:1:5:6 | [JSXElement] <Foo/> | semmle.label | [JSXElement] <Foo/> |
+| tst.js:5:1:5:6 | [JsxElement] <Foo/> | semmle.label | [JsxElement] <Foo/> |
 | tst.js:5:1:5:7 | [ExprStmt] <Foo/>; | semmle.label | [ExprStmt] <Foo/>; |
 | tst.js:5:1:5:7 | [ExprStmt] <Foo/>; | semmle.order | 5 |
 | tst.js:5:2:5:4 | [VarRef] Foo | semmle.label | [VarRef] Foo |
-| tst.js:6:1:6:10 | [JSXElement] <Foo-Bar/> | semmle.label | [JSXElement] <Foo-Bar/> |
+| tst.js:6:1:6:10 | [JsxElement] <Foo-Bar/> | semmle.label | [JsxElement] <Foo-Bar/> |
 | tst.js:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | semmle.label | [ExprStmt] <Foo-Bar/>; |
 | tst.js:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | semmle.order | 6 |
 | tst.js:6:2:6:8 | [Label] Foo-Bar | semmle.label | [Label] Foo-Bar |
@@ -58,9 +58,9 @@ nodes
 | tst.js:7:1:7:52 | [DeclStmt] var fragment = ... | semmle.order | 7 |
 | tst.js:7:5:7:12 | [VarDecl] fragment | semmle.label | [VarDecl] fragment |
 | tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | semmle.label | [VariableDeclarator] fragmen ... ext </> |
-| tst.js:7:16:7:52 | [JSXFragment] <> frag ... ext </> | semmle.label | [JSXFragment] <> frag ... ext </> |
+| tst.js:7:16:7:52 | [JsxFragment] <> frag ... ext </> | semmle.label | [JsxFragment] <> frag ... ext </> |
 | tst.js:7:18:7:32 | [Literal]  fragment text  | semmle.label | [Literal]  fragment text  |
-| tst.js:7:33:7:38 | [JSXElement] <Foo/> | semmle.label | [JSXElement] <Foo/> |
+| tst.js:7:33:7:38 | [JsxElement] <Foo/> | semmle.label | [JsxElement] <Foo/> |
 | tst.js:7:34:7:36 | [VarRef] Foo | semmle.label | [VarRef] Foo |
 | tst.js:7:39:7:49 | [Literal]  more text  | semmle.label | [Literal]  more text  |
 | tstest.tsx:1:1:1:32 | [DeclStmt] var href = ... | semmle.label | [DeclStmt] var href = ... |
@@ -76,37 +76,37 @@ nodes
 | tstest.tsx:2:19:2:21 | [Label] rel | semmle.label | [Label] rel |
 | tstest.tsx:2:19:2:44 | [Property] rel: "noopener noreferrer" | semmle.label | [Property] rel: "noopener noreferrer" |
 | tstest.tsx:2:24:2:44 | [Literal] "noopener noreferrer" | semmle.label | [Literal] "noopener noreferrer" |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | semmle.label | [JSXElement] <a href ... */}</a> |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | semmle.label | [JsxElement] <a href ... */}</a> |
 | tstest.tsx:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | semmle.label | [ExprStmt] <a href ... /}</a>; |
 | tstest.tsx:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | semmle.order | 10 |
 | tstest.tsx:3:2:3:2 | [Label] a | semmle.label | [Label] a |
 | tstest.tsx:3:4:3:7 | [Label] href | semmle.label | [Label] href |
-| tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | semmle.label | [JSXAttribute] href={href} |
+| tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | semmle.label | [JsxAttribute] href={href} |
 | tstest.tsx:3:10:3:13 | [VarRef] href | semmle.label | [VarRef] href |
 | tstest.tsx:3:16:3:21 | [Label] target | semmle.label | [Label] target |
-| tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | semmle.label | [JSXAttribute] target="_blank" |
+| tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | semmle.label | [JsxAttribute] target="_blank" |
 | tstest.tsx:3:23:3:30 | [Literal] "_blank" | semmle.label | [Literal] "_blank" |
-| tstest.tsx:3:32:3:45 | [JSXAttribute] {...linkTypes} | semmle.label | [JSXAttribute] {...linkTypes} |
+| tstest.tsx:3:32:3:45 | [JsxAttribute] {...linkTypes} | semmle.label | [JsxAttribute] {...linkTypes} |
 | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.label | [SpreadElement] ...linkTypes |
 | tstest.tsx:3:36:3:44 | [VarRef] linkTypes | semmle.label | [VarRef] linkTypes |
 | tstest.tsx:3:47:3:54 | [Literal] Link to  | semmle.label | [Literal] Link to  |
 | tstest.tsx:3:56:3:59 | [VarRef] href | semmle.label | [VarRef] href |
 | tstest.tsx:3:61:3:62 | [Literal] .  | semmle.label | [Literal] .  |
-| tstest.tsx:3:63:3:102 | [JSXEmptyExpr] {/*TODO ... text*/} | semmle.label | [JSXEmptyExpr] {/*TODO ... text*/} |
-| tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | semmle.label | [JSXElement] <MyComp ... "bar"/> |
+| tstest.tsx:3:63:3:102 | [JsxEmptyExpr] {/*TODO ... text*/} | semmle.label | [JsxEmptyExpr] {/*TODO ... text*/} |
+| tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | semmle.label | [JsxElement] <MyComp ... "bar"/> |
 | tstest.tsx:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | semmle.label | [ExprStmt] <MyComp ... bar"/>; |
 | tstest.tsx:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | semmle.order | 11 |
 | tstest.tsx:4:2:4:13 | [VarRef] MyComponents | semmle.label | [VarRef] MyComponents |
 | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.label | [DotExpr] MyCompo ... ncyLink |
 | tstest.tsx:4:15:4:23 | [Label] FancyLink | semmle.label | [Label] FancyLink |
 | tstest.tsx:4:25:4:27 | [Label] foo | semmle.label | [Label] foo |
-| tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | semmle.label | [JSXAttribute] foo="bar" |
+| tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | semmle.label | [JsxAttribute] foo="bar" |
 | tstest.tsx:4:29:4:33 | [Literal] "bar" | semmle.label | [Literal] "bar" |
-| tstest.tsx:5:1:5:6 | [JSXElement] <Foo/> | semmle.label | [JSXElement] <Foo/> |
+| tstest.tsx:5:1:5:6 | [JsxElement] <Foo/> | semmle.label | [JsxElement] <Foo/> |
 | tstest.tsx:5:1:5:7 | [ExprStmt] <Foo/>; | semmle.label | [ExprStmt] <Foo/>; |
 | tstest.tsx:5:1:5:7 | [ExprStmt] <Foo/>; | semmle.order | 12 |
 | tstest.tsx:5:2:5:4 | [VarRef] Foo | semmle.label | [VarRef] Foo |
-| tstest.tsx:6:1:6:10 | [JSXElement] <Foo-Bar/> | semmle.label | [JSXElement] <Foo-Bar/> |
+| tstest.tsx:6:1:6:10 | [JsxElement] <Foo-Bar/> | semmle.label | [JsxElement] <Foo-Bar/> |
 | tstest.tsx:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | semmle.label | [ExprStmt] <Foo-Bar/>; |
 | tstest.tsx:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | semmle.order | 13 |
 | tstest.tsx:6:2:6:8 | [Label] Foo-Bar | semmle.label | [Label] Foo-Bar |
@@ -114,40 +114,40 @@ nodes
 | tstest.tsx:7:1:7:52 | [DeclStmt] var fragment = ... | semmle.order | 14 |
 | tstest.tsx:7:5:7:12 | [VarDecl] fragment | semmle.label | [VarDecl] fragment |
 | tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | semmle.label | [VariableDeclarator] fragmen ... ext </> |
-| tstest.tsx:7:16:7:52 | [JSXFragment] <> frag ... ext </> | semmle.label | [JSXFragment] <> frag ... ext </> |
+| tstest.tsx:7:16:7:52 | [JsxFragment] <> frag ... ext </> | semmle.label | [JsxFragment] <> frag ... ext </> |
 | tstest.tsx:7:19:7:32 | [Literal] fragment text  | semmle.label | [Literal] fragment text  |
-| tstest.tsx:7:33:7:38 | [JSXElement] <Foo/> | semmle.label | [JSXElement] <Foo/> |
+| tstest.tsx:7:33:7:38 | [JsxElement] <Foo/> | semmle.label | [JsxElement] <Foo/> |
 | tstest.tsx:7:34:7:36 | [VarRef] Foo | semmle.label | [VarRef] Foo |
 | tstest.tsx:7:40:7:49 | [Literal] more text  | semmle.label | [Literal] more text  |
 edges
-| file://:0:0:0:0 | (Attributes) | tst.js:3:4:3:14 | [JSXAttribute] href={href} | semmle.label | 0 |
-| file://:0:0:0:0 | (Attributes) | tst.js:3:4:3:14 | [JSXAttribute] href={href} | semmle.order | 0 |
-| file://:0:0:0:0 | (Attributes) | tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | semmle.label | 1 |
-| file://:0:0:0:0 | (Attributes) | tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | semmle.order | 1 |
-| file://:0:0:0:0 | (Attributes) | tst.js:3:32:3:45 | [JSXAttribute] {...linkTypes} | semmle.label | 2 |
-| file://:0:0:0:0 | (Attributes) | tst.js:3:32:3:45 | [JSXAttribute] {...linkTypes} | semmle.order | 2 |
-| file://:0:0:0:0 | (Attributes) | tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | semmle.label | 0 |
-| file://:0:0:0:0 | (Attributes) | tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | semmle.order | 0 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | semmle.label | 0 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | semmle.order | 0 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | semmle.label | 1 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | semmle.order | 1 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:32:3:45 | [JSXAttribute] {...linkTypes} | semmle.label | 2 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:32:3:45 | [JSXAttribute] {...linkTypes} | semmle.order | 2 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | semmle.label | 0 |
-| file://:0:0:0:0 | (Attributes) | tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | semmle.order | 0 |
+| file://:0:0:0:0 | (Attributes) | tst.js:3:4:3:14 | [JsxAttribute] href={href} | semmle.label | 0 |
+| file://:0:0:0:0 | (Attributes) | tst.js:3:4:3:14 | [JsxAttribute] href={href} | semmle.order | 0 |
+| file://:0:0:0:0 | (Attributes) | tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | semmle.label | 1 |
+| file://:0:0:0:0 | (Attributes) | tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | semmle.order | 1 |
+| file://:0:0:0:0 | (Attributes) | tst.js:3:32:3:45 | [JsxAttribute] {...linkTypes} | semmle.label | 2 |
+| file://:0:0:0:0 | (Attributes) | tst.js:3:32:3:45 | [JsxAttribute] {...linkTypes} | semmle.order | 2 |
+| file://:0:0:0:0 | (Attributes) | tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | semmle.label | 0 |
+| file://:0:0:0:0 | (Attributes) | tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | semmle.order | 0 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | semmle.label | 0 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | semmle.order | 0 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | semmle.label | 1 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | semmle.order | 1 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:32:3:45 | [JsxAttribute] {...linkTypes} | semmle.label | 2 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:3:32:3:45 | [JsxAttribute] {...linkTypes} | semmle.order | 2 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | semmle.label | 0 |
+| file://:0:0:0:0 | (Attributes) | tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | semmle.order | 0 |
 | file://:0:0:0:0 | (Body) | tst.js:3:47:3:54 | [Literal] Link to  | semmle.label | 0 |
 | file://:0:0:0:0 | (Body) | tst.js:3:47:3:54 | [Literal] Link to  | semmle.order | 0 |
 | file://:0:0:0:0 | (Body) | tst.js:3:56:3:59 | [VarRef] href | semmle.label | 1 |
 | file://:0:0:0:0 | (Body) | tst.js:3:56:3:59 | [VarRef] href | semmle.order | 1 |
 | file://:0:0:0:0 | (Body) | tst.js:3:61:3:62 | [Literal] .  | semmle.label | 2 |
 | file://:0:0:0:0 | (Body) | tst.js:3:61:3:62 | [Literal] .  | semmle.order | 2 |
-| file://:0:0:0:0 | (Body) | tst.js:3:64:3:101 | [JSXEmptyExpr]  | semmle.label | 3 |
-| file://:0:0:0:0 | (Body) | tst.js:3:64:3:101 | [JSXEmptyExpr]  | semmle.order | 3 |
+| file://:0:0:0:0 | (Body) | tst.js:3:64:3:101 | [JsxEmptyExpr]  | semmle.label | 3 |
+| file://:0:0:0:0 | (Body) | tst.js:3:64:3:101 | [JsxEmptyExpr]  | semmle.order | 3 |
 | file://:0:0:0:0 | (Body) | tst.js:7:18:7:32 | [Literal]  fragment text  | semmle.label | 0 |
 | file://:0:0:0:0 | (Body) | tst.js:7:18:7:32 | [Literal]  fragment text  | semmle.order | 0 |
-| file://:0:0:0:0 | (Body) | tst.js:7:33:7:38 | [JSXElement] <Foo/> | semmle.label | 1 |
-| file://:0:0:0:0 | (Body) | tst.js:7:33:7:38 | [JSXElement] <Foo/> | semmle.order | 1 |
+| file://:0:0:0:0 | (Body) | tst.js:7:33:7:38 | [JsxElement] <Foo/> | semmle.label | 1 |
+| file://:0:0:0:0 | (Body) | tst.js:7:33:7:38 | [JsxElement] <Foo/> | semmle.order | 1 |
 | file://:0:0:0:0 | (Body) | tst.js:7:39:7:49 | [Literal]  more text  | semmle.label | 2 |
 | file://:0:0:0:0 | (Body) | tst.js:7:39:7:49 | [Literal]  more text  | semmle.order | 2 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:3:47:3:54 | [Literal] Link to  | semmle.label | 0 |
@@ -156,12 +156,12 @@ edges
 | file://:0:0:0:0 | (Body) | tstest.tsx:3:56:3:59 | [VarRef] href | semmle.order | 1 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:3:61:3:62 | [Literal] .  | semmle.label | 2 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:3:61:3:62 | [Literal] .  | semmle.order | 2 |
-| file://:0:0:0:0 | (Body) | tstest.tsx:3:63:3:102 | [JSXEmptyExpr] {/*TODO ... text*/} | semmle.label | 3 |
-| file://:0:0:0:0 | (Body) | tstest.tsx:3:63:3:102 | [JSXEmptyExpr] {/*TODO ... text*/} | semmle.order | 3 |
+| file://:0:0:0:0 | (Body) | tstest.tsx:3:63:3:102 | [JsxEmptyExpr] {/*TODO ... text*/} | semmle.label | 3 |
+| file://:0:0:0:0 | (Body) | tstest.tsx:3:63:3:102 | [JsxEmptyExpr] {/*TODO ... text*/} | semmle.order | 3 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:7:19:7:32 | [Literal] fragment text  | semmle.label | 0 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:7:19:7:32 | [Literal] fragment text  | semmle.order | 0 |
-| file://:0:0:0:0 | (Body) | tstest.tsx:7:33:7:38 | [JSXElement] <Foo/> | semmle.label | 1 |
-| file://:0:0:0:0 | (Body) | tstest.tsx:7:33:7:38 | [JSXElement] <Foo/> | semmle.order | 1 |
+| file://:0:0:0:0 | (Body) | tstest.tsx:7:33:7:38 | [JsxElement] <Foo/> | semmle.label | 1 |
+| file://:0:0:0:0 | (Body) | tstest.tsx:7:33:7:38 | [JsxElement] <Foo/> | semmle.order | 1 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:7:40:7:49 | [Literal] more text  | semmle.label | 2 |
 | file://:0:0:0:0 | (Body) | tstest.tsx:7:40:7:49 | [Literal] more text  | semmle.order | 2 |
 | tst.js:1:1:1:32 | [DeclStmt] var href = ... | tst.js:1:5:1:31 | [VariableDeclarator] href = ... le.com" | semmle.label | 1 |
@@ -182,58 +182,58 @@ edges
 | tst.js:2:19:2:44 | [Property] rel: "noopener noreferrer" | tst.js:2:19:2:21 | [Label] rel | semmle.order | 1 |
 | tst.js:2:19:2:44 | [Property] rel: "noopener noreferrer" | tst.js:2:24:2:44 | [Literal] "noopener noreferrer" | semmle.label | 2 |
 | tst.js:2:19:2:44 | [Property] rel: "noopener noreferrer" | tst.js:2:24:2:44 | [Literal] "noopener noreferrer" | semmle.order | 2 |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | tst.js:3:2:3:2 | [Label] a | semmle.label | 0 |
-| tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | tst.js:3:2:3:2 | [Label] a | semmle.order | 0 |
-| tst.js:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | semmle.label | 1 |
-| tst.js:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tst.js:3:1:3:106 | [JSXElement] <a href ... */}</a> | semmle.order | 1 |
-| tst.js:3:4:3:14 | [JSXAttribute] href={href} | tst.js:3:4:3:7 | [Label] href | semmle.label | 1 |
-| tst.js:3:4:3:14 | [JSXAttribute] href={href} | tst.js:3:4:3:7 | [Label] href | semmle.order | 1 |
-| tst.js:3:4:3:14 | [JSXAttribute] href={href} | tst.js:3:10:3:13 | [VarRef] href | semmle.label | 2 |
-| tst.js:3:4:3:14 | [JSXAttribute] href={href} | tst.js:3:10:3:13 | [VarRef] href | semmle.order | 2 |
-| tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | tst.js:3:16:3:21 | [Label] target | semmle.label | 1 |
-| tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | tst.js:3:16:3:21 | [Label] target | semmle.order | 1 |
-| tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | tst.js:3:23:3:30 | [Literal] "_blank" | semmle.label | 2 |
-| tst.js:3:16:3:30 | [JSXAttribute] target="_blank" | tst.js:3:23:3:30 | [Literal] "_blank" | semmle.order | 2 |
-| tst.js:3:32:3:45 | [JSXAttribute] {...linkTypes} | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.label | 1 |
-| tst.js:3:32:3:45 | [JSXAttribute] {...linkTypes} | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.order | 1 |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | tst.js:3:2:3:2 | [Label] a | semmle.label | 0 |
+| tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | tst.js:3:2:3:2 | [Label] a | semmle.order | 0 |
+| tst.js:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | semmle.label | 1 |
+| tst.js:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tst.js:3:1:3:106 | [JsxElement] <a href ... */}</a> | semmle.order | 1 |
+| tst.js:3:4:3:14 | [JsxAttribute] href={href} | tst.js:3:4:3:7 | [Label] href | semmle.label | 1 |
+| tst.js:3:4:3:14 | [JsxAttribute] href={href} | tst.js:3:4:3:7 | [Label] href | semmle.order | 1 |
+| tst.js:3:4:3:14 | [JsxAttribute] href={href} | tst.js:3:10:3:13 | [VarRef] href | semmle.label | 2 |
+| tst.js:3:4:3:14 | [JsxAttribute] href={href} | tst.js:3:10:3:13 | [VarRef] href | semmle.order | 2 |
+| tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | tst.js:3:16:3:21 | [Label] target | semmle.label | 1 |
+| tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | tst.js:3:16:3:21 | [Label] target | semmle.order | 1 |
+| tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | tst.js:3:23:3:30 | [Literal] "_blank" | semmle.label | 2 |
+| tst.js:3:16:3:30 | [JsxAttribute] target="_blank" | tst.js:3:23:3:30 | [Literal] "_blank" | semmle.order | 2 |
+| tst.js:3:32:3:45 | [JsxAttribute] {...linkTypes} | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.label | 1 |
+| tst.js:3:32:3:45 | [JsxAttribute] {...linkTypes} | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.order | 1 |
 | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | tst.js:3:36:3:44 | [VarRef] linkTypes | semmle.label | 1 |
 | tst.js:3:32:3:45 | [SpreadElement] ...linkTypes | tst.js:3:36:3:44 | [VarRef] linkTypes | semmle.order | 1 |
-| tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
-| tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
-| tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.label | 0 |
-| tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.order | 0 |
-| tst.js:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | semmle.label | 1 |
-| tst.js:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tst.js:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | semmle.order | 1 |
+| tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
+| tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
+| tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.label | 0 |
+| tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.order | 0 |
+| tst.js:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | semmle.label | 1 |
+| tst.js:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tst.js:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | semmle.order | 1 |
 | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tst.js:4:2:4:13 | [VarRef] MyComponents | semmle.label | 1 |
 | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tst.js:4:2:4:13 | [VarRef] MyComponents | semmle.order | 1 |
 | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tst.js:4:15:4:23 | [Label] FancyLink | semmle.label | 2 |
 | tst.js:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tst.js:4:15:4:23 | [Label] FancyLink | semmle.order | 2 |
-| tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | tst.js:4:25:4:27 | [Label] foo | semmle.label | 1 |
-| tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | tst.js:4:25:4:27 | [Label] foo | semmle.order | 1 |
-| tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | tst.js:4:29:4:33 | [Literal] "bar" | semmle.label | 2 |
-| tst.js:4:25:4:33 | [JSXAttribute] foo="bar" | tst.js:4:29:4:33 | [Literal] "bar" | semmle.order | 2 |
-| tst.js:5:1:5:6 | [JSXElement] <Foo/> | tst.js:5:2:5:4 | [VarRef] Foo | semmle.label | 0 |
-| tst.js:5:1:5:6 | [JSXElement] <Foo/> | tst.js:5:2:5:4 | [VarRef] Foo | semmle.order | 0 |
-| tst.js:5:1:5:7 | [ExprStmt] <Foo/>; | tst.js:5:1:5:6 | [JSXElement] <Foo/> | semmle.label | 1 |
-| tst.js:5:1:5:7 | [ExprStmt] <Foo/>; | tst.js:5:1:5:6 | [JSXElement] <Foo/> | semmle.order | 1 |
-| tst.js:6:1:6:10 | [JSXElement] <Foo-Bar/> | tst.js:6:2:6:8 | [Label] Foo-Bar | semmle.label | 0 |
-| tst.js:6:1:6:10 | [JSXElement] <Foo-Bar/> | tst.js:6:2:6:8 | [Label] Foo-Bar | semmle.order | 0 |
-| tst.js:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tst.js:6:1:6:10 | [JSXElement] <Foo-Bar/> | semmle.label | 1 |
-| tst.js:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tst.js:6:1:6:10 | [JSXElement] <Foo-Bar/> | semmle.order | 1 |
+| tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | tst.js:4:25:4:27 | [Label] foo | semmle.label | 1 |
+| tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | tst.js:4:25:4:27 | [Label] foo | semmle.order | 1 |
+| tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | tst.js:4:29:4:33 | [Literal] "bar" | semmle.label | 2 |
+| tst.js:4:25:4:33 | [JsxAttribute] foo="bar" | tst.js:4:29:4:33 | [Literal] "bar" | semmle.order | 2 |
+| tst.js:5:1:5:6 | [JsxElement] <Foo/> | tst.js:5:2:5:4 | [VarRef] Foo | semmle.label | 0 |
+| tst.js:5:1:5:6 | [JsxElement] <Foo/> | tst.js:5:2:5:4 | [VarRef] Foo | semmle.order | 0 |
+| tst.js:5:1:5:7 | [ExprStmt] <Foo/>; | tst.js:5:1:5:6 | [JsxElement] <Foo/> | semmle.label | 1 |
+| tst.js:5:1:5:7 | [ExprStmt] <Foo/>; | tst.js:5:1:5:6 | [JsxElement] <Foo/> | semmle.order | 1 |
+| tst.js:6:1:6:10 | [JsxElement] <Foo-Bar/> | tst.js:6:2:6:8 | [Label] Foo-Bar | semmle.label | 0 |
+| tst.js:6:1:6:10 | [JsxElement] <Foo-Bar/> | tst.js:6:2:6:8 | [Label] Foo-Bar | semmle.order | 0 |
+| tst.js:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tst.js:6:1:6:10 | [JsxElement] <Foo-Bar/> | semmle.label | 1 |
+| tst.js:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tst.js:6:1:6:10 | [JsxElement] <Foo-Bar/> | semmle.order | 1 |
 | tst.js:7:1:7:52 | [DeclStmt] var fragment = ... | tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | semmle.label | 1 |
 | tst.js:7:1:7:52 | [DeclStmt] var fragment = ... | tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | semmle.order | 1 |
 | tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tst.js:7:5:7:12 | [VarDecl] fragment | semmle.label | 1 |
 | tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tst.js:7:5:7:12 | [VarDecl] fragment | semmle.order | 1 |
-| tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tst.js:7:16:7:52 | [JSXFragment] <> frag ... ext </> | semmle.label | 2 |
-| tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tst.js:7:16:7:52 | [JSXFragment] <> frag ... ext </> | semmle.order | 2 |
-| tst.js:7:16:7:52 | [JSXFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
-| tst.js:7:16:7:52 | [JSXFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
-| tst.js:7:33:7:38 | [JSXElement] <Foo/> | tst.js:7:34:7:36 | [VarRef] Foo | semmle.label | 0 |
-| tst.js:7:33:7:38 | [JSXElement] <Foo/> | tst.js:7:34:7:36 | [VarRef] Foo | semmle.order | 0 |
+| tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tst.js:7:16:7:52 | [JsxFragment] <> frag ... ext </> | semmle.label | 2 |
+| tst.js:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tst.js:7:16:7:52 | [JsxFragment] <> frag ... ext </> | semmle.order | 2 |
+| tst.js:7:16:7:52 | [JsxFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
+| tst.js:7:16:7:52 | [JsxFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
+| tst.js:7:33:7:38 | [JsxElement] <Foo/> | tst.js:7:34:7:36 | [VarRef] Foo | semmle.label | 0 |
+| tst.js:7:33:7:38 | [JsxElement] <Foo/> | tst.js:7:34:7:36 | [VarRef] Foo | semmle.order | 0 |
 | tstest.tsx:1:1:1:32 | [DeclStmt] var href = ... | tstest.tsx:1:5:1:31 | [VariableDeclarator] href = ... le.com" | semmle.label | 1 |
 | tstest.tsx:1:1:1:32 | [DeclStmt] var href = ... | tstest.tsx:1:5:1:31 | [VariableDeclarator] href = ... le.com" | semmle.order | 1 |
 | tstest.tsx:1:5:1:31 | [VariableDeclarator] href = ... le.com" | tstest.tsx:1:5:1:8 | [VarDecl] href | semmle.label | 1 |
@@ -252,57 +252,57 @@ edges
 | tstest.tsx:2:19:2:44 | [Property] rel: "noopener noreferrer" | tstest.tsx:2:19:2:21 | [Label] rel | semmle.order | 1 |
 | tstest.tsx:2:19:2:44 | [Property] rel: "noopener noreferrer" | tstest.tsx:2:24:2:44 | [Literal] "noopener noreferrer" | semmle.label | 2 |
 | tstest.tsx:2:19:2:44 | [Property] rel: "noopener noreferrer" | tstest.tsx:2:24:2:44 | [Literal] "noopener noreferrer" | semmle.order | 2 |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | tstest.tsx:3:2:3:2 | [Label] a | semmle.label | 0 |
-| tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | tstest.tsx:3:2:3:2 | [Label] a | semmle.order | 0 |
-| tstest.tsx:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | semmle.label | 1 |
-| tstest.tsx:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tstest.tsx:3:1:3:106 | [JSXElement] <a href ... */}</a> | semmle.order | 1 |
-| tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | tstest.tsx:3:4:3:7 | [Label] href | semmle.label | 1 |
-| tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | tstest.tsx:3:4:3:7 | [Label] href | semmle.order | 1 |
-| tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | tstest.tsx:3:10:3:13 | [VarRef] href | semmle.label | 2 |
-| tstest.tsx:3:4:3:14 | [JSXAttribute] href={href} | tstest.tsx:3:10:3:13 | [VarRef] href | semmle.order | 2 |
-| tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | tstest.tsx:3:16:3:21 | [Label] target | semmle.label | 1 |
-| tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | tstest.tsx:3:16:3:21 | [Label] target | semmle.order | 1 |
-| tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | tstest.tsx:3:23:3:30 | [Literal] "_blank" | semmle.label | 2 |
-| tstest.tsx:3:16:3:30 | [JSXAttribute] target="_blank" | tstest.tsx:3:23:3:30 | [Literal] "_blank" | semmle.order | 2 |
-| tstest.tsx:3:32:3:45 | [JSXAttribute] {...linkTypes} | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.label | 1 |
-| tstest.tsx:3:32:3:45 | [JSXAttribute] {...linkTypes} | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.order | 1 |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | tstest.tsx:3:2:3:2 | [Label] a | semmle.label | 0 |
+| tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | tstest.tsx:3:2:3:2 | [Label] a | semmle.order | 0 |
+| tstest.tsx:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | semmle.label | 1 |
+| tstest.tsx:3:1:3:107 | [ExprStmt] <a href ... /}</a>; | tstest.tsx:3:1:3:106 | [JsxElement] <a href ... */}</a> | semmle.order | 1 |
+| tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | tstest.tsx:3:4:3:7 | [Label] href | semmle.label | 1 |
+| tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | tstest.tsx:3:4:3:7 | [Label] href | semmle.order | 1 |
+| tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | tstest.tsx:3:10:3:13 | [VarRef] href | semmle.label | 2 |
+| tstest.tsx:3:4:3:14 | [JsxAttribute] href={href} | tstest.tsx:3:10:3:13 | [VarRef] href | semmle.order | 2 |
+| tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | tstest.tsx:3:16:3:21 | [Label] target | semmle.label | 1 |
+| tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | tstest.tsx:3:16:3:21 | [Label] target | semmle.order | 1 |
+| tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | tstest.tsx:3:23:3:30 | [Literal] "_blank" | semmle.label | 2 |
+| tstest.tsx:3:16:3:30 | [JsxAttribute] target="_blank" | tstest.tsx:3:23:3:30 | [Literal] "_blank" | semmle.order | 2 |
+| tstest.tsx:3:32:3:45 | [JsxAttribute] {...linkTypes} | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.label | 1 |
+| tstest.tsx:3:32:3:45 | [JsxAttribute] {...linkTypes} | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | semmle.order | 1 |
 | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | tstest.tsx:3:36:3:44 | [VarRef] linkTypes | semmle.label | 1 |
 | tstest.tsx:3:32:3:45 | [SpreadElement] ...linkTypes | tstest.tsx:3:36:3:44 | [VarRef] linkTypes | semmle.order | 1 |
-| tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
-| tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
-| tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.label | 0 |
-| tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.order | 0 |
-| tstest.tsx:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | semmle.label | 1 |
-| tstest.tsx:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tstest.tsx:4:1:4:35 | [JSXElement] <MyComp ... "bar"/> | semmle.order | 1 |
+| tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.label | 2 |
+| tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | file://:0:0:0:0 | (Attributes) | semmle.order | 2 |
+| tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.label | 0 |
+| tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | semmle.order | 0 |
+| tstest.tsx:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | semmle.label | 1 |
+| tstest.tsx:4:1:4:36 | [ExprStmt] <MyComp ... bar"/>; | tstest.tsx:4:1:4:35 | [JsxElement] <MyComp ... "bar"/> | semmle.order | 1 |
 | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tstest.tsx:4:2:4:13 | [VarRef] MyComponents | semmle.label | 1 |
 | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tstest.tsx:4:2:4:13 | [VarRef] MyComponents | semmle.order | 1 |
 | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tstest.tsx:4:15:4:23 | [Label] FancyLink | semmle.label | 2 |
 | tstest.tsx:4:2:4:23 | [DotExpr] MyCompo ... ncyLink | tstest.tsx:4:15:4:23 | [Label] FancyLink | semmle.order | 2 |
-| tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | tstest.tsx:4:25:4:27 | [Label] foo | semmle.label | 1 |
-| tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | tstest.tsx:4:25:4:27 | [Label] foo | semmle.order | 1 |
-| tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | tstest.tsx:4:29:4:33 | [Literal] "bar" | semmle.label | 2 |
-| tstest.tsx:4:25:4:33 | [JSXAttribute] foo="bar" | tstest.tsx:4:29:4:33 | [Literal] "bar" | semmle.order | 2 |
-| tstest.tsx:5:1:5:6 | [JSXElement] <Foo/> | tstest.tsx:5:2:5:4 | [VarRef] Foo | semmle.label | 0 |
-| tstest.tsx:5:1:5:6 | [JSXElement] <Foo/> | tstest.tsx:5:2:5:4 | [VarRef] Foo | semmle.order | 0 |
-| tstest.tsx:5:1:5:7 | [ExprStmt] <Foo/>; | tstest.tsx:5:1:5:6 | [JSXElement] <Foo/> | semmle.label | 1 |
-| tstest.tsx:5:1:5:7 | [ExprStmt] <Foo/>; | tstest.tsx:5:1:5:6 | [JSXElement] <Foo/> | semmle.order | 1 |
-| tstest.tsx:6:1:6:10 | [JSXElement] <Foo-Bar/> | tstest.tsx:6:2:6:8 | [Label] Foo-Bar | semmle.label | 0 |
-| tstest.tsx:6:1:6:10 | [JSXElement] <Foo-Bar/> | tstest.tsx:6:2:6:8 | [Label] Foo-Bar | semmle.order | 0 |
-| tstest.tsx:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tstest.tsx:6:1:6:10 | [JSXElement] <Foo-Bar/> | semmle.label | 1 |
-| tstest.tsx:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tstest.tsx:6:1:6:10 | [JSXElement] <Foo-Bar/> | semmle.order | 1 |
+| tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | tstest.tsx:4:25:4:27 | [Label] foo | semmle.label | 1 |
+| tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | tstest.tsx:4:25:4:27 | [Label] foo | semmle.order | 1 |
+| tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | tstest.tsx:4:29:4:33 | [Literal] "bar" | semmle.label | 2 |
+| tstest.tsx:4:25:4:33 | [JsxAttribute] foo="bar" | tstest.tsx:4:29:4:33 | [Literal] "bar" | semmle.order | 2 |
+| tstest.tsx:5:1:5:6 | [JsxElement] <Foo/> | tstest.tsx:5:2:5:4 | [VarRef] Foo | semmle.label | 0 |
+| tstest.tsx:5:1:5:6 | [JsxElement] <Foo/> | tstest.tsx:5:2:5:4 | [VarRef] Foo | semmle.order | 0 |
+| tstest.tsx:5:1:5:7 | [ExprStmt] <Foo/>; | tstest.tsx:5:1:5:6 | [JsxElement] <Foo/> | semmle.label | 1 |
+| tstest.tsx:5:1:5:7 | [ExprStmt] <Foo/>; | tstest.tsx:5:1:5:6 | [JsxElement] <Foo/> | semmle.order | 1 |
+| tstest.tsx:6:1:6:10 | [JsxElement] <Foo-Bar/> | tstest.tsx:6:2:6:8 | [Label] Foo-Bar | semmle.label | 0 |
+| tstest.tsx:6:1:6:10 | [JsxElement] <Foo-Bar/> | tstest.tsx:6:2:6:8 | [Label] Foo-Bar | semmle.order | 0 |
+| tstest.tsx:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tstest.tsx:6:1:6:10 | [JsxElement] <Foo-Bar/> | semmle.label | 1 |
+| tstest.tsx:6:1:6:11 | [ExprStmt] <Foo-Bar/>; | tstest.tsx:6:1:6:10 | [JsxElement] <Foo-Bar/> | semmle.order | 1 |
 | tstest.tsx:7:1:7:52 | [DeclStmt] var fragment = ... | tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | semmle.label | 1 |
 | tstest.tsx:7:1:7:52 | [DeclStmt] var fragment = ... | tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | semmle.order | 1 |
 | tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tstest.tsx:7:5:7:12 | [VarDecl] fragment | semmle.label | 1 |
 | tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tstest.tsx:7:5:7:12 | [VarDecl] fragment | semmle.order | 1 |
-| tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tstest.tsx:7:16:7:52 | [JSXFragment] <> frag ... ext </> | semmle.label | 2 |
-| tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tstest.tsx:7:16:7:52 | [JSXFragment] <> frag ... ext </> | semmle.order | 2 |
-| tstest.tsx:7:16:7:52 | [JSXFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
-| tstest.tsx:7:16:7:52 | [JSXFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
-| tstest.tsx:7:33:7:38 | [JSXElement] <Foo/> | tstest.tsx:7:34:7:36 | [VarRef] Foo | semmle.label | 0 |
-| tstest.tsx:7:33:7:38 | [JSXElement] <Foo/> | tstest.tsx:7:34:7:36 | [VarRef] Foo | semmle.order | 0 |
+| tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tstest.tsx:7:16:7:52 | [JsxFragment] <> frag ... ext </> | semmle.label | 2 |
+| tstest.tsx:7:5:7:52 | [VariableDeclarator] fragmen ... ext </> | tstest.tsx:7:16:7:52 | [JsxFragment] <> frag ... ext </> | semmle.order | 2 |
+| tstest.tsx:7:16:7:52 | [JsxFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.label | 1 |
+| tstest.tsx:7:16:7:52 | [JsxFragment] <> frag ... ext </> | file://:0:0:0:0 | (Body) | semmle.order | 1 |
+| tstest.tsx:7:33:7:38 | [JsxElement] <Foo/> | tstest.tsx:7:34:7:36 | [VarRef] Foo | semmle.label | 0 |
+| tstest.tsx:7:33:7:38 | [JsxElement] <Foo/> | tstest.tsx:7:34:7:36 | [VarRef] Foo | semmle.order | 0 |
 graphProperties
 | semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/JSX/tests.ql b/javascript/ql/test/library-tests/JSX/tests.ql
index 2e36c72e2fc..279b9c7c88e 100644
--- a/javascript/ql/test/library-tests/JSX/tests.ql
+++ b/javascript/ql/test/library-tests/JSX/tests.ql
@@ -1,22 +1,22 @@
 import javascript
 
-query predicate htmlElements(JSXElement e) { e.getNameExpr() instanceof Label }
+query predicate htmlElements(JsxElement e) { e.getNameExpr() instanceof Label }
 
-query predicate jsxElementAttribute(JSXElement elt, int i, JSXAttribute attr) {
+query predicate jsxElementAttribute(JsxElement elt, int i, JsxAttribute attr) {
   attr = elt.getAttribute(i)
 }
 
-query predicate jsxElementAttributeName(JSXElement elt, int i, string name) {
+query predicate jsxElementAttributeName(JsxElement elt, int i, string name) {
   name = elt.getAttribute(i).getName()
 }
 
-query predicate jsxElementBody(JSXElement elt, int i, Expr body) { elt.getBodyElement(i) = body }
+query predicate jsxElementBody(JsxElement elt, int i, Expr body) { elt.getBodyElement(i) = body }
 
-query predicate jsxElementName(JSXElement elt, JSXName nameExpr, string name) {
+query predicate jsxElementName(JsxElement elt, JsxName nameExpr, string name) {
   elt.getNameExpr() = nameExpr and
   name = elt.getName()
 }
 
-query predicate jsxFragments(JSXFragment fragment, int i, Expr body) {
+query predicate jsxFragments(JsxFragment fragment, int i, Expr body) {
   fragment.getBodyElement(i) = body
 }
diff --git a/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql b/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql
index 3f0d3eb4607..8baff66c6b8 100644
--- a/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql
+++ b/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql
@@ -2,4 +2,4 @@ import javascript
 
 query File files() { any() }
 
-query PackageJSON packageJsons() { any() }
+query PackageJson packageJsons() { any() }
diff --git a/javascript/ql/test/library-tests/NPM/tests.expected b/javascript/ql/test/library-tests/NPM/tests.expected
index 696500f8163..48691fe0117 100644
--- a/javascript/ql/test/library-tests/NPM/tests.expected
+++ b/javascript/ql/test/library-tests/NPM/tests.expected
@@ -38,7 +38,7 @@ getMainModule
 | src/node_modules/d/package.json:1:1:4:1 | {\\n  "na ... main"\\n} | d | src/node_modules/d/main.js:1:1:2:0 | <toplevel> |
 | src/node_modules/third-party-module/package.json:1:1:5:1 | {\\n  "na ... y.js"\\n} | third-party-module | src/node_modules/third-party-module/fancy.js:1:1:4:0 | <toplevel> |
 | src/package.json:1:1:20:1 | {\\n  "na ... "\\n  }\\n} | test-package | src/index.js:1:1:4:0 | <toplevel> |
-packageJSON
+packageJson
 | src/node_modules/b/package.json:1:1:4:1 | {\\n  "na ... "lib"\\n} |
 | src/node_modules/c/package.json:1:1:4:1 | {\\n  "na ... src/"\\n} |
 | src/node_modules/d/package.json:1:1:4:1 | {\\n  "na ... main"\\n} |
diff --git a/javascript/ql/test/library-tests/NPM/tests.ql b/javascript/ql/test/library-tests/NPM/tests.ql
index 52714084a81..2f92f9b41b0 100644
--- a/javascript/ql/test/library-tests/NPM/tests.ql
+++ b/javascript/ql/test/library-tests/NPM/tests.ql
@@ -1,7 +1,7 @@
 import javascript
 import semmle.javascript.dependencies.Dependencies
 
-query predicate dependencies(PackageJSON pkgjson, string pkg, string version) {
+query predicate dependencies(PackageJson pkgjson, string pkg, string version) {
   pkgjson.declaresDependency(pkg, version)
 }
 
@@ -9,22 +9,22 @@ query predicate importedFile(Require r, File f) { f = r.getImportedFile() }
 
 query predicate importedModule(Require r, Module m) { m = r.getImportedModule() }
 
-query predicate modules(NPMPackage pkg, string name, Module mod) {
+query predicate modules(NpmPackage pkg, string name, Module mod) {
   name = pkg.getPackageName() and
   mod = pkg.getAModule()
 }
 
-query predicate npm(PackageJSON pkg, string name, string version) {
+query predicate npm(PackageJson pkg, string name, string version) {
   name = pkg.getPackageName() and
   version = pkg.getVersion()
 }
 
-query predicate getMainModule(PackageJSON pkg, string name, Module mod) {
+query predicate getMainModule(PackageJson pkg, string name, Module mod) {
   name = pkg.getPackageName() and
   mod = pkg.getMainModule()
 }
 
-query predicate packageJSON(PackageJSON json) { any() }
+query predicate packageJson(PackageJson json) { any() }
 
 query predicate dependencyInfo(Dependency dep, string name, string version) {
   dep.info(name, version)
diff --git a/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql b/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql
index 4b98650d123..177bb4cd6f4 100644
--- a/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql
+++ b/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql
@@ -1,4 +1,4 @@
 import semmle.javascript.SourceMaps
 
 from SourceMappingComment smc
-select smc, smc.getSourceMappingURL()
+select smc, smc.getSourceMappingUrl()
diff --git a/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql b/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
index e1254629fe1..c1ba57d2746 100644
--- a/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
+++ b/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
@@ -1,7 +1,7 @@
 import javascript
 
 query predicate test_CallSignature(
-  CallSignature call, string declType, ASTNode body, string abstractness
+  CallSignature call, string declType, AstNode body, string abstractness
 ) {
   (if call.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = call.getDeclaringType().describe() and
@@ -9,7 +9,7 @@ query predicate test_CallSignature(
 }
 
 query predicate test_IndexSignature(
-  IndexSignature sig, string declType, ASTNode body, string abstractness
+  IndexSignature sig, string declType, AstNode body, string abstractness
 ) {
   (if sig.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = sig.getDeclaringType().describe() and
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
index 450989f717b..69fcca56921 100644
--- a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
+++ b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
@@ -6,4 +6,4 @@ query predicate resolveableImport(Import imp, Module mod) {
   not mod.getTopLevel().isExterns()
 }
 
-query Module getMain(PackageJSON json) { result = json.getMainModule() }
+query Module getMain(PackageJson json) { result = json.getMainModule() }
diff --git a/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql b/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql
index 6dbc248e68e..43ad92c405f 100644
--- a/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql
+++ b/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql
@@ -1,6 +1,6 @@
 import javascript
 
-abstract class Violation extends ASTNode {
+abstract class Violation extends AstNode {
   abstract string reason();
 }
 
@@ -11,17 +11,17 @@ abstract class Violation extends ASTNode {
  * The assertion holds if `name1 = name2`, indicating that `X` resolved to the right interface.
  */
 class TypeResolutionAssertion extends TupleTypeExpr, Violation {
-  InterfaceDeclaration interface;
-  LocalTypeAccess typeAccess;
   string expected;
   string actual;
 
   TypeResolutionAssertion() {
-    typeAccess = getElementType(0) and
-    expected = getElementType(1).(StringLiteralTypeExpr).getValue() and
-    typeAccess.getLocalTypeName() = interface.getIdentifier().(TypeDecl).getLocalTypeName() and
-    actual = interface.getField("where").getTypeAnnotation().(StringLiteralTypeExpr).getValue() and
-    actual != expected
+    exists(InterfaceDeclaration interface, LocalTypeAccess typeAccess |
+      typeAccess = getElementType(0) and
+      expected = getElementType(1).(StringLiteralTypeExpr).getValue() and
+      typeAccess.getLocalTypeName() = interface.getIdentifier().(TypeDecl).getLocalTypeName() and
+      actual = interface.getField("where").getTypeAnnotation().(StringLiteralTypeExpr).getValue() and
+      actual != expected
+    )
   }
 
   override string reason() {
diff --git a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
index a271f821ac4..8f93f6f3734 100644
--- a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
+++ b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
@@ -1,6 +1,6 @@
 import javascript
 
-query predicate symbols(ASTNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
+query predicate symbols(AstNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
 
 from Import imprt
 select imprt, imprt.getImportedModule()
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll
index 76f83803ea3..947c0e935f4 100644
--- a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll
+++ b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll
@@ -1,7 +1,7 @@
 import javascript
 
-query predicate test_ChildIndex(ASTNode node, string res) {
-  exists(ASTNode child1, ASTNode child2, int index |
+query predicate test_ChildIndex(AstNode node, string res) {
+  exists(AstNode child1, AstNode child2, int index |
     node.getChild(index) = child1 and node.getChild(index) = child2 and child1 != child2
   |
     res = "There are two different children at index " + index.toString()
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll
index dcdc8b2ae6a..04abab0fcf3 100644
--- a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll
+++ b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll
@@ -1,6 +1,6 @@
 import javascript
 
-abstract class Violation extends ASTNode {
+abstract class Violation extends AstNode {
   abstract string reason();
 }
 
diff --git a/javascript/ql/test/library-tests/TypeTracking/ClassStyle.ql b/javascript/ql/test/library-tests/TypeTracking/ClassStyle.ql
index 1c412bb33a3..02059b13039 100644
--- a/javascript/ql/test/library-tests/TypeTracking/ClassStyle.ql
+++ b/javascript/ql/test/library-tests/TypeTracking/ClassStyle.ql
@@ -23,9 +23,7 @@ class ApiObject extends DataFlow::NewNode {
 }
 
 class Connection extends DataFlow::SourceNode {
-  ApiObject api;
-
-  Connection() { this = api.ref().getAMethodCall("createConnection") }
+  Connection() { this = any(ApiObject api).ref().getAMethodCall("createConnection") }
 
   DataFlow::SourceNode ref(DataFlow::TypeTracker t) {
     t.start() and
@@ -49,9 +47,7 @@ class Connection extends DataFlow::SourceNode {
 }
 
 class DataValue extends DataFlow::SourceNode {
-  Connection connection;
-
-  DataValue() { this = connection.getACallback().getParameter(0) }
+  DataValue() { this = any(Connection connection).getACallback().getParameter(0) }
 
   DataFlow::SourceNode ref(DataFlow::TypeTracker t) {
     t.start() and
diff --git a/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll b/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll
index a5e8d0dc7a9..940332693a7 100644
--- a/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll
+++ b/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll
@@ -1,17 +1,20 @@
 import semmle.javascript.frameworks.React
 
-query predicate test_JSXname(JSXElement element, JSXName jsxname, string name, string type) {
+query predicate test_JSXname(JsxElement element, JsxName jsxname, string name, string type) {
   name = jsxname.getValue() and
   (
     jsxname instanceof Identifier and type = "Identifier"
     or
     jsxname instanceof ThisExpr and type = "thisExpr"
     or
-    jsxname.(DotExpr).getBase() instanceof JSXName and type = "dot"
+    jsxname.(DotExpr).getBase() instanceof JsxName and type = "dot"
     or
-    jsxname instanceof JSXQualifiedName and type = "qualifiedName"
+    jsxname instanceof JsxQualifiedName and type = "qualifiedName"
   ) and
   element.getNameExpr() = jsxname
 }
 
-query ThisExpr test_JSXName_this(JSXElement element) { result.getParentExpr+() = element }
+query ThisExpr test_JsxName_this(JsxElement element) { result.getParentExpr+() = element }
+
+/** DEPRECATED: Alias for test_JsxName_this */
+deprecated ThisExpr test_JSXName_this(JSXElement element) { result = test_JsxName_this(element) }
diff --git a/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected b/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
index f64d386b45b..e05a8445cfa 100644
--- a/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
@@ -300,7 +300,7 @@ test_JSXname
 | useHigherOrderComponent.jsx:5:12:5:39 | <SomeCo ... "red"/> | useHigherOrderComponent.jsx:5:13:5:25 | SomeComponent | SomeComponent | Identifier |
 | useHigherOrderComponent.jsx:11:12:11:46 | <LazyLo ... lazy"/> | useHigherOrderComponent.jsx:11:13:11:31 | LazyLoadedComponent | LazyLoadedComponent | Identifier |
 | useHigherOrderComponent.jsx:17:12:17:48 | <LazyLo ... azy2"/> | useHigherOrderComponent.jsx:17:13:17:32 | LazyLoadedComponent2 | LazyLoadedComponent2 | Identifier |
-test_JSXName_this
+test_JsxName_this
 | es5.js:4:12:4:45 | <div>He ... }</div> | es5.js:4:24:4:27 | this |
 | es5.js:20:12:20:44 | <h1>Hel ... e}</h1> | es5.js:20:24:20:27 | this |
 | es6.js:3:12:3:45 | <div>He ... }</div> | es6.js:3:24:3:27 | this |
diff --git a/javascript/ql/test/library-tests/frameworks/UriLibraries/tests.ql b/javascript/ql/test/library-tests/frameworks/UriLibraries/tests.ql
index 6f7a8f764ac..0467e9ca19e 100644
--- a/javascript/ql/test/library-tests/frameworks/UriLibraries/tests.ql
+++ b/javascript/ql/test/library-tests/frameworks/UriLibraries/tests.ql
@@ -1,21 +1,21 @@
 import javascript
 
-query predicate punycode(DataFlow::Node n) { n = punycode::punycodeMember(_) }
+query predicate punycode(DataFlow::Node n) { n = Punycode::punycodeMember(_) }
 
-query predicate querydashstring(DataFlow::Node n) { n = querydashstring::querydashstringMember(_) }
+query predicate querydashstring(DataFlow::Node n) { n = Querydashstring::querydashstringMember(_) }
 
-query predicate querystring(DataFlow::Node n) { n = querystring::querystringMember(_) }
+query predicate querystring(DataFlow::Node n) { n = Querystring::querystringMember(_) }
 
-query predicate querystringify(DataFlow::Node n) { n = querystringify::querystringifyMember(_) }
+query predicate querystringify(DataFlow::Node n) { n = Querystringify::querystringifyMember(_) }
 
-query predicate uridashjs(DataFlow::Node n) { n = uridashjs::uridashjsMember(_) }
+query predicate uridashjs(DataFlow::Node n) { n = Uridashjs::uridashjsMember(_) }
 
-query predicate urijs(DataFlow::Node n) { n = urijs::urijs() }
+query predicate urijs(DataFlow::Node n) { n = Urijs::urijs() }
 
 query predicate uriLibraryStep(DataFlow::Node pred, DataFlow::Node succ) {
   TaintTracking::uriStep(pred, succ)
 }
 
-query predicate url(DataFlow::Node n) { n = url::urlMember(_) }
+query predicate url(DataFlow::Node n) { n = Url::urlMember(_) }
 
-query predicate urlParse(DataFlow::Node n) { n = urlParse::urlParse() }
+query predicate urlParse(DataFlow::Node n) { n = UrlParse::urlParse() }
diff --git a/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.expected b/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.expected
index 1f0a5b4e5a0..ab15599933c 100644
--- a/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.expected
+++ b/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.expected
@@ -1,4 +1,3 @@
-WARNING: Type JQueryMethodCall has been deprecated and may be removed in future (JQueryMethodCall.ql:3,6-22)
 | tracking.js:7:5:7:24 | this.elm.html('foo') | html |
 | tracking.js:14:5:14:17 | e.html('foo') | html |
 | tracking.js:15:5:15:26 | e.attr( ...  'foo') | attr |
diff --git a/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.ql b/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.ql
index a8165264547..6c975249c6c 100644
--- a/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.ql
+++ b/javascript/ql/test/library-tests/frameworks/jQuery/JQueryMethodCall.ql
@@ -1,4 +1,4 @@
 import javascript
 
-from JQueryMethodCall jqmc
+from JQuery::MethodCall jqmc
 select jqmc, jqmc.getMethodName()
diff --git a/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.expected b/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.expected
index bf2d21578ca..c0dddd9d050 100644
--- a/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.expected
+++ b/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.expected
@@ -1,4 +1,3 @@
-WARNING: Type JQueryMethodCall has been deprecated and may be removed in future (interpretsArgumentAsHtml.ql:3,6-22)
 | tracking.js:7:5:7:24 | this.elm.html('foo') | tracking.js:7:19:7:23 | 'foo' |
 | tracking.js:14:5:14:17 | e.html('foo') | tracking.js:14:12:14:16 | 'foo' |
 | tracking.js:23:7:23:15 | $('#foo') | tracking.js:23:9:23:14 | '#foo' |
diff --git a/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.ql b/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.ql
index 371849cdb1d..299ae7958e3 100644
--- a/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.ql
+++ b/javascript/ql/test/library-tests/frameworks/jQuery/interpretsArgumentAsHtml.ql
@@ -1,5 +1,5 @@
 import javascript
 
-from JQueryMethodCall mc, Expr e
-where mc.interpretsArgumentAsHtml(e)
-select mc, e
+from JQuery::MethodCall mc, DataFlow::Node node
+where mc.interpretsArgumentAsHtml(node)
+select mc, node
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
index 3878bbc2088..3e53d9b79b8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
@@ -52,6 +52,11 @@ nodes
 | child_process-test.js:83:19:83:36 | req.query.fileName |
 | child_process-test.js:85:37:85:54 | req.query.fileName |
 | child_process-test.js:85:37:85:54 | req.query.fileName |
+| child_process-test.js:94:11:94:35 | "ping " ... ms.host |
+| child_process-test.js:94:11:94:35 | "ping " ... ms.host |
+| child_process-test.js:94:21:94:30 | ctx.params |
+| child_process-test.js:94:21:94:30 | ctx.params |
+| child_process-test.js:94:21:94:35 | ctx.params.host |
 | exec-sh2.js:9:17:9:23 | command |
 | exec-sh2.js:10:40:10:46 | command |
 | exec-sh2.js:10:40:10:46 | command |
@@ -229,6 +234,10 @@ edges
 | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName |
 | child_process-test.js:85:37:85:54 | req.query.fileName | lib/subLib/index.js:7:32:7:35 | name |
 | child_process-test.js:85:37:85:54 | req.query.fileName | lib/subLib/index.js:7:32:7:35 | name |
+| child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:21:94:35 | ctx.params.host |
+| child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:21:94:35 | ctx.params.host |
+| child_process-test.js:94:21:94:35 | ctx.params.host | child_process-test.js:94:11:94:35 | "ping " ... ms.host |
+| child_process-test.js:94:21:94:35 | ctx.params.host | child_process-test.js:94:11:94:35 | "ping " ... ms.host |
 | exec-sh2.js:9:17:9:23 | command | exec-sh2.js:10:40:10:46 | command |
 | exec-sh2.js:9:17:9:23 | command | exec-sh2.js:10:40:10:46 | command |
 | exec-sh2.js:14:9:14:49 | cmd | exec-sh2.js:15:12:15:14 | cmd |
@@ -365,6 +374,7 @@ edges
 | child_process-test.js:67:3:67:21 | cp.spawn(cmd, args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:48:15:48:17 | cmd | This command depends on $@. | child_process-test.js:6:25:6:31 | req.url | a user-provided value |
 | child_process-test.js:75:29:75:31 | cmd | child_process-test.js:73:25:73:31 | req.url | child_process-test.js:75:29:75:31 | cmd | This command depends on $@. | child_process-test.js:73:25:73:31 | req.url | a user-provided value |
 | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | This command depends on $@. | child_process-test.js:83:19:83:36 | req.query.fileName | a user-provided value |
+| child_process-test.js:94:11:94:35 | "ping " ... ms.host | child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:11:94:35 | "ping " ... ms.host | This command depends on $@. | child_process-test.js:94:21:94:30 | ctx.params | a user-provided value |
 | exec-sh2.js:10:12:10:57 | cp.spaw ... ptions) | exec-sh2.js:14:25:14:31 | req.url | exec-sh2.js:10:40:10:46 | command | This command depends on $@. | exec-sh2.js:14:25:14:31 | req.url | a user-provided value |
 | exec-sh.js:15:12:15:61 | cp.spaw ... ptions) | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:15:44:15:50 | command | This command depends on $@. | exec-sh.js:19:25:19:31 | req.url | a user-provided value |
 | execSeries.js:14:41:14:47 | command | execSeries.js:18:34:18:40 | req.url | execSeries.js:14:41:14:47 | command | This command depends on $@. | execSeries.js:18:34:18:40 | req.url | a user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/child_process-test.js b/javascript/ql/test/query-tests/Security/CWE-078/child_process-test.js
index 61c06c9377d..abc9704a48e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/child_process-test.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/child_process-test.js
@@ -85,4 +85,11 @@ new webpackDevServer(compiler, {
           require("my-sub-lib").foo(req.query.fileName); // calls lib/subLib/index.js#foo
         });
     }
+});
+
+import Router from "koa-router";
+const router = new Router();
+
+router.get("/ping/:host", async (ctx) => {
+  cp.exec("ping " + ctx.params.host); // NOT OK
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.expected b/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.expected
index 9b21e2f5d8b..a99ae396964 100644
--- a/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.expected
@@ -8,3 +8,4 @@
 | tst.js:39:2:39:29 | rejectU ... ndirect | Disabling certificate validation is strongly discouraged. |
 | tst.js:45:2:45:28 | rejectU ... !!false | Disabling certificate validation is strongly discouraged. |
 | tst.js:48:2:48:26 | rejectU ... : !true | Disabling certificate validation is strongly discouraged. |
+| tst.js:74:9:74:33 | rejectU ... : false | Disabling certificate validation is strongly discouraged. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-295/tst.js b/javascript/ql/test/query-tests/Security/CWE-295/tst.js
index fb1bf3d8a4e..8088b767e18 100644
--- a/javascript/ql/test/query-tests/Security/CWE-295/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-295/tst.js
@@ -68,3 +68,10 @@ new https.Agent({
 new https.Agent({
 	rejectUnauthorized: typeof getOptions().rejectUnauthorized === 'boolean' ? getOptions().rejectUnauthorized : undefined // OK
 });
+
+function getSomeunsafeOptions() {
+    return {
+        rejectUnauthorized: false // NOT OK
+    }
+}
+new https.Agent(getSomeunsafeOptions());
\ No newline at end of file
diff --git a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll
index 6412643f11a..46ec0fe8f31 100644
--- a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll	
+++ b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll	
@@ -1,8 +1,8 @@
 import javascript
 
 query predicate test_query19(PackageDependencies deps, string res) {
-  exists(NPMPackage pkg, string name |
-    deps = pkg.getPackageJSON().getDependencies() and
+  exists(NpmPackage pkg, string name |
+    deps = pkg.getPackageJson().getDependencies() and
     deps.getADependency(name, _) and
     not exists(Require req | req.getTopLevel() = pkg.getAModule() |
       name = req.getImportedPath().getValue()
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql
index 044814978f4..a03ff0e4257 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql	
@@ -9,17 +9,17 @@ import javascript
 import Osprey
 import RAML
 
-RAMLMethod getSpecification(OspreyMethod om) {
-  exists(RAMLResource rr, File f, string rPath |
+RamlMethod getSpecification(OspreyMethod om) {
+  exists(RamlResource rr, File f, string rPath |
     rr.getLocation().getFile() = f and
-    f = om.getDefinition().getAPI().getSpecFile() and
+    f = om.getDefinition().getApi().getSpecFile() and
     rPath = om.getResourcePath() and
     rr.getPath() = rPath.regexpReplaceAll("/:([^/]+)/", "/{$1}/") and
     result = rr.getMethod(om.getVerb())
   )
 }
 
-from MethodResponseSetStatus mrss, RAMLMethod rm
+from MethodResponseSetStatus mrss, RamlMethod rm
 where
   rm = getSpecification(mrss.getMethod()) and
   not exists(rm.getResponse(mrss.getStatusCode()))
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll b/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll
index 4140260a1d8..d7c7df8e1fd 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll	
@@ -13,8 +13,8 @@ class Osprey extends Variable {
 }
 
 /** A call to `osprey.create`. */
-class OspreyCreateAPICall extends MethodCallExpr {
-  OspreyCreateAPICall() {
+class OspreyCreateApiCall extends MethodCallExpr {
+  OspreyCreateApiCall() {
     getReceiver().(VarAccess).getVariable() instanceof Osprey and
     getMethodName() = "create"
   }
@@ -29,22 +29,31 @@ class OspreyCreateAPICall extends MethodCallExpr {
   }
 }
 
-/** A variable in which an Osprey API object is stored. */
-class OspreyAPI extends Variable {
-  OspreyAPI() { getAnAssignedExpr() instanceof OspreyCreateAPICall }
+/** DEPRECATED: Alias for OspreyCreateApiCall */
+deprecated class OspreyCreateAPICall = OspreyCreateApiCall;
 
-  File getSpecFile() { result = getAnAssignedExpr().(OspreyCreateAPICall).getSpecFile() }
+/** A variable in which an Osprey API object is stored. */
+class OspreyApi extends Variable {
+  OspreyApi() { getAnAssignedExpr() instanceof OspreyCreateApiCall }
+
+  File getSpecFile() { result = getAnAssignedExpr().(OspreyCreateApiCall).getSpecFile() }
 }
 
+/** DEPRECATED: Alias for OspreyApi */
+deprecated class OspreyAPI = OspreyApi;
+
 /** An Osprey REST method definition. */
 class OspreyMethodDefinition extends MethodCallExpr {
   OspreyMethodDefinition() {
-    exists(OspreyAPI api | getReceiver() = api.getAnAccess()) and
+    exists(OspreyApi api | getReceiver() = api.getAnAccess()) and
     getMethodName() = httpVerb()
   }
 
   /** Get the API to which this method belongs. */
-  OspreyAPI getAPI() { getReceiver() = result.getAnAccess() }
+  OspreyApi getApi() { getReceiver() = result.getAnAccess() }
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated OspreyAPI getAPI() { result = getApi() }
 
   /** Get the verb which this method implements. */
   string getVerb() { result = getMethodName() }
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll b/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll
index 01c33f19e1d..1156ea4c398 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll	
@@ -3,14 +3,17 @@ import javascript
 import HTTP
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
+/** DEPRECATED: Alias for RamlSpec */
+deprecated class RAMLSpec = RamlSpec;
+
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,25 +22,28 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
+/** DEPRECATED: Alias for RamlResource */
+deprecated class RAMLResource = RamlResource;
+
 /** A RAML method specification. */
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 
@@ -50,3 +56,6 @@ class RAMLMethod extends YAMLValue {
     )
   }
 }
+
+/** DEPRECATED: Alias for RamlMethod */
+deprecated class RAMLMethod = RamlMethod;
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql
index 00294fe3ea6..a20fd7f18f1 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql	
@@ -1,9 +1,9 @@
 import javascript
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
-from RAMLSpec s
+from RamlSpec s
 select s
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql
index 5e5acba3d3e..e0230cbfdb0 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql	
@@ -3,14 +3,14 @@ import javascript
 string httpVerb() { result = ["get", "put", "post", "delete"] }
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,25 +19,25 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
 /** A RAML method specification. */
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 
@@ -51,5 +51,5 @@ class RAMLMethod extends YAMLValue {
   }
 }
 
-from RAMLResource rr
+from RamlResource rr
 select rr, rr.getPath()
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql
index a503976c388..60ee68a8369 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql	
@@ -3,14 +3,14 @@ import javascript
 string httpVerb() { result = ["get", "put", "post", "delete"] }
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,24 +19,24 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 }
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql
index 1bbd4b07622..0cabb0adb25 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql	
@@ -3,14 +3,14 @@ import javascript
 string httpVerb() { result = ["get", "put", "post", "delete"] }
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,25 +19,25 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
 /** A RAML method specification. */
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 
@@ -51,5 +51,5 @@ class RAMLMethod extends YAMLValue {
   }
 }
 
-from RAMLMethod m
+from RamlMethod m
 select m
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index c3e5859574b..a27de64e175 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.0.11
+
+### Minor Analysis Improvements
+
+* Added new SSRF sinks for `httpx`, `pycurl`, `urllib`, `urllib2`, `urllib3`, and `libtaxii`. This improvement was [submitted by @haby0](https://github.com/github/codeql/pull/8275).
+* The regular expression parser now groups sequences of normal characters. This reduces the number of instances of `RegExpNormalChar`.
+* Fixed taint propagation for attribute assignment. In the assignment `x.foo = tainted` we no longer treat the entire object `x` as tainted, just because the attribute `foo` contains tainted data. This leads to slightly fewer false positives.
+* Improved analysis of attributes for data-flow and taint tracking queries, so `getattr`/`setattr` are supported, and a write to an attribute properly stops flow for the old value in that attribute.
+* Added post-update nodes (`DataFlow::PostUpdateNode`) for arguments in calls that can't be resolved.
+
 ## 0.0.10
 
 ### Deprecated APIs
diff --git a/python/ql/lib/change-notes/2022-02-04-improve-field-flow.md b/python/ql/lib/change-notes/2022-02-04-improve-field-flow.md
deleted file mode 100644
index 9b544ddd3d9..00000000000
--- a/python/ql/lib/change-notes/2022-02-04-improve-field-flow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* Improved analysis of attributes for data-flow and taint tracking queries, so `getattr`/`setattr` are supported, and a write to an attribute properly stops flow for the old value in that attribute.
-* Added post-update nodes (`DataFlow::PostUpdateNode`) for arguments in calls that can't be resolved.
diff --git a/python/ql/lib/change-notes/2022-02-07-deleted-deprecations.md b/python/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
new file mode 100644
index 00000000000..e8da1e8e158
--- /dev/null
+++ b/python/ql/lib/change-notes/2022-02-07-deleted-deprecations.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* All deprecated predicates/classes/modules that have been deprecated for over a year have been deleted.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md b/python/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
new file mode 100644
index 00000000000..a79f286aacd
--- /dev/null
+++ b/python/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2022-02-07-deprecated-modules.md b/python/ql/lib/change-notes/2022-02-07-deprecated-modules.md
new file mode 100644
index 00000000000..561f68a150c
--- /dev/null
+++ b/python/ql/lib/change-notes/2022-02-07-deprecated-modules.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Some modules that started with a lowercase letter have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2022-02-08-fix-attribute-taint.md b/python/ql/lib/change-notes/2022-02-08-fix-attribute-taint.md
deleted file mode 100644
index 1a7917dabb7..00000000000
--- a/python/ql/lib/change-notes/2022-02-08-fix-attribute-taint.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Fixed taint propagation for attribute assignment. In the assignment `x.foo = tainted` we no longer treat the entire object `x` as tainted, just because the attribute `foo` contains tainted data. This leads to slightly fewer false positives.
diff --git a/python/ql/lib/change-notes/2022-02-25-regex-group-characters.md b/python/ql/lib/change-notes/2022-02-25-regex-group-characters.md
deleted file mode 100644
index 615fe002313..00000000000
--- a/python/ql/lib/change-notes/2022-02-25-regex-group-characters.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The regular expression parser now groups sequences of normal characters. This reduces the number of instances of `RegExpNormalChar`.
diff --git a/python/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md b/python/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
new file mode 100644
index 00000000000..3481d507db3
--- /dev/null
+++ b/python/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The flow state variants of `isBarrier` and `isAdditionalFlowStep` are no longer exposed in the taint tracking library. The `isSanitizer` and `isAdditionalTaintStep` predicates should be used instead.
diff --git a/python/ql/lib/change-notes/released/0.0.11.md b/python/ql/lib/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..ffe51dbd82a
--- /dev/null
+++ b/python/ql/lib/change-notes/released/0.0.11.md
@@ -0,0 +1,9 @@
+## 0.0.11
+
+### Minor Analysis Improvements
+
+* Added new SSRF sinks for `httpx`, `pycurl`, `urllib`, `urllib2`, `urllib3`, and `libtaxii`. This improvement was [submitted by @haby0](https://github.com/github/codeql/pull/8275).
+* The regular expression parser now groups sequences of normal characters. This reduces the number of instances of `RegExpNormalChar`.
+* Fixed taint propagation for attribute assignment. In the assignment `x.foo = tainted` we no longer treat the entire object `x` as tainted, just because the attribute `foo` contains tainted data. This leads to slightly fewer false positives.
+* Improved analysis of attributes for data-flow and taint tracking queries, so `getattr`/`setattr` are supported, and a write to an attribute properly stops flow for the old value in that attribute.
+* Added post-update nodes (`DataFlow::PostUpdateNode`) for arguments in calls that can't be resolved.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 0c72ef23386..bb519f0f44b 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/lib/semmle/python/AstExtended.qll b/python/ql/lib/semmle/python/AstExtended.qll
index 2d1a2be7c54..25a8784c615 100644
--- a/python/ql/lib/semmle/python/AstExtended.qll
+++ b/python/ql/lib/semmle/python/AstExtended.qll
@@ -1,6 +1,6 @@
 import python
 
-/** Syntactic node (Class, Function, Module, Expr, Stmt or Comprehension) corresponding to a flow node */
+/** A syntactic node (Class, Function, Module, Expr, Stmt or Comprehension) corresponding to a flow node */
 abstract class AstNode extends AstNode_ {
   /*
    * Special comment for documentation generation.
@@ -61,31 +61,31 @@ abstract class AstNode extends AstNode_ {
 }
 
 /* Parents */
-/** Internal implementation class */
+/** The parent of a `Function`. Internal implementation class */
 class FunctionParent extends FunctionParent_ { }
 
-/** Internal implementation class */
+/** The parent of an `Arguments` node. Internal implementation class */
 class ArgumentsParent extends ArgumentsParent_ { }
 
-/** Internal implementation class */
+/** The parent of an `ExprList`. Internal implementation class */
 class ExprListParent extends ExprListParent_ { }
 
-/** Internal implementation class */
+/** The parent of an `ExprContext`. Internal implementation class */
 class ExprContextParent extends ExprContextParent_ { }
 
-/** Internal implementation class */
+/** The parent of a `StmtList`. Internal implementation class */
 class StmtListParent extends StmtListParent_ { }
 
-/** Internal implementation class */
+/** The parent of a `StrList`. Internal implementation class */
 class StrListParent extends StrListParent_ { }
 
-/** Internal implementation class */
+/** The parent of an `Expr`. Internal implementation class */
 class ExprParent extends ExprParent_ { }
 
-/** Internal implementation class */
+/** The parent of a `PatternList`. Internal implementation class */
 class PatternListParent extends PatternListParent_ { }
 
-/** Internal implementation class */
+/** The parent of a `Pattern`. Internal implementation class */
 class PatternParent extends PatternParent_ { }
 
 class DictItem extends DictItem_, AstNode {
@@ -120,7 +120,7 @@ class Comprehension extends Comprehension_, AstNode {
 class BytesOrStr extends BytesOrStr_ { }
 
 /**
- * Part of a string literal formed by implicit concatenation.
+ * A part of a string literal formed by implicit concatenation.
  * For example the string literal "abc" expressed in the source as `"a" "b" "c"`
  * would be composed of three `StringPart`s.
  */
diff --git a/python/ql/lib/semmle/python/Class.qll b/python/ql/lib/semmle/python/Class.qll
index a2a4c88a53e..52c6c5aa389 100644
--- a/python/ql/lib/semmle/python/Class.qll
+++ b/python/ql/lib/semmle/python/Class.qll
@@ -85,12 +85,6 @@ class ClassDef extends Assign {
 
 /** The scope of a class. This is the scope of all the statements within the class definition */
 class Class extends Class_, Scope, AstNode {
-  /**
-   * Use getADecorator() instead of getDefinition().getADecorator()
-   * Use getMetaClass() instead of getDefinition().getMetaClass()
-   */
-  deprecated ClassExpr getDefinition() { result = this.getParent() }
-
   /** Gets a defined init method of this class */
   Function getInitMethod() { result.getScope() = this and result.isInitMethod() }
 
diff --git a/python/ql/lib/semmle/python/Comment.qll b/python/ql/lib/semmle/python/Comment.qll
index 012d6c46b41..839d700b8cd 100644
--- a/python/ql/lib/semmle/python/Comment.qll
+++ b/python/ql/lib/semmle/python/Comment.qll
@@ -59,7 +59,7 @@ class CommentBlock extends @py_comment {
   /** Gets a textual representation of this element. */
   string toString() { result = "Comment block" }
 
-  /** The length of this comment block (in comments) */
+  /** Gets the length of this comment block (in comments) */
   int length() { result = max(int i | comment_block_part(this, _, i)) }
 
   /**
diff --git a/python/ql/lib/semmle/python/Comparisons.qll b/python/ql/lib/semmle/python/Comparisons.qll
index d62f3157990..d27d15531bc 100644
--- a/python/ql/lib/semmle/python/Comparisons.qll
+++ b/python/ql/lib/semmle/python/Comparisons.qll
@@ -76,22 +76,22 @@ class CompareOp extends int {
   }
 }
 
-/** The `CompareOp` for "equals". */
+/** Gets the `CompareOp` for "equals". */
 CompareOp eq() { result = 1 }
 
-/** The `CompareOp` for "not equals". */
+/** Gets the `CompareOp` for "not equals". */
 CompareOp ne() { result = 2 }
 
-/** The `CompareOp` for "less than". */
+/** Gets the `CompareOp` for "less than". */
 CompareOp lt() { result = 3 }
 
-/** The `CompareOp` for "less than or equal to". */
+/** Gets the `CompareOp` for "less than or equal to". */
 CompareOp le() { result = 4 }
 
-/** The `CompareOp` for "greater than". */
+/** Gets the `CompareOp` for "greater than". */
 CompareOp gt() { result = 5 }
 
-/** The `CompareOp` for "greater than or equal to". */
+/** Gets the `CompareOp` for "greater than or equal to". */
 CompareOp ge() { result = 6 }
 
 /* Workaround precision limits in floating point numbers */
diff --git a/python/ql/lib/semmle/python/Comprehensions.qll b/python/ql/lib/semmle/python/Comprehensions.qll
index 421ee32ce62..ae947f5d084 100644
--- a/python/ql/lib/semmle/python/Comprehensions.qll
+++ b/python/ql/lib/semmle/python/Comprehensions.qll
@@ -1,6 +1,6 @@
 import python
 
-/** Base class for list, set and dictionary comprehensions, and generator expressions. */
+/** The base class for list, set and dictionary comprehensions, and generator expressions. */
 abstract class Comp extends Expr {
   abstract Function getFunction();
 
diff --git a/python/ql/lib/semmle/python/Exprs.qll b/python/ql/lib/semmle/python/Exprs.qll
index 766b9d03e56..cef83af0f5a 100644
--- a/python/ql/lib/semmle/python/Exprs.qll
+++ b/python/ql/lib/semmle/python/Exprs.qll
@@ -30,9 +30,6 @@ class Expr extends Expr_, AstNode {
   /** Whether this expression is a constant */
   predicate isConstant() { not this.isVariable() }
 
-  /** Use isParenthesized instead. */
-  deprecated override predicate isParenthesised() { this.isParenthesized() }
-
   /** Whether the parenthesized property of this expression is true. */
   predicate isParenthesized() { Expr_.super.isParenthesised() }
 
@@ -49,9 +46,6 @@ class Expr extends Expr_, AstNode {
   /** Gets an immediate (non-nested) sub-expression of this expression */
   Expr getASubExpression() { none() }
 
-  /** Use StrConst.getText() instead */
-  deprecated string strValue() { none() }
-
   override AstNode getAChildNode() { result = this.getASubExpression() }
 
   /**
@@ -315,7 +309,7 @@ class Ellipsis extends Ellipsis_ {
 }
 
 /**
- * Immutable literal expressions (except tuples).
+ * An immutable literal expression (except tuples).
  * Consists of string (both unicode and byte) literals and numeric literals.
  */
 abstract class ImmutableLiteral extends Expr {
@@ -446,6 +440,8 @@ class Unicode extends StrConst {
   }
 
   /**
+   * Gets the quoted representation fo this string.
+   *
    * The extractor puts quotes into the name of each string (to prevent "0" clashing with 0).
    * The following predicate help us match up a string/byte literals in the source
    * which the equivalent object.
@@ -620,8 +616,6 @@ class StrConst extends Str_, ImmutableLiteral {
     )
   }
 
-  deprecated override string strValue() { result = this.getS() }
-
   override Expr getASubExpression() { none() }
 
   override AstNode getAChildNode() { result = this.getAnImplicitlyConcatenatedPart() }
@@ -685,7 +679,7 @@ class False extends BooleanLiteral {
   override boolean booleanValue() { result = false }
 }
 
-/** `None` */
+/** The `None` constant. */
 class None extends NameConstant {
   /* syntax: None */
   None() { name_consts(this, "None") }
@@ -728,20 +722,20 @@ class Guard extends Guard_ {
 /** A context in which an expression used */
 class ExprContext extends ExprContext_ { }
 
-/** Load context, the context of var in len(var) */
+/** The load context, the context of var in len(var) */
 class Load extends Load_ { }
 
-/** Store context, the context of var in var = 0 */
+/** The store context, the context of var in var = 0 */
 class Store extends Store_ { }
 
-/** Delete context, the context of var in del var */
+/** The delete context, the context of var in del var */
 class Del extends Del_ { }
 
-/** This is an artifact of the Python grammar which includes an AugLoad context, even though it is never used. */
-library class AugLoad extends AugLoad_ { }
+/** The context of an augmented load. This is an artifact of the Python grammar which includes an AugLoad context, even though it is never used. */
+class AugLoad extends AugLoad_ { }
 
-/** Augmented store context, the context of var in var += 1 */
+/** The augmented store context, the context of var in var += 1 */
 class AugStore extends AugStore_ { }
 
-/** Parameter context, the context of var in def f(var): pass */
+/** The parameter context, the context of var in def f(var): pass */
 class Param extends Param_ { }
diff --git a/python/ql/lib/semmle/python/Files.qll b/python/ql/lib/semmle/python/Files.qll
index 99570fc4d7a..6de19807ac1 100644
--- a/python/ql/lib/semmle/python/Files.qll
+++ b/python/ql/lib/semmle/python/Files.qll
@@ -2,12 +2,6 @@ import python
 
 /** A file */
 class File extends Container, @file {
-  /** DEPRECATED: Use `getAbsolutePath` instead. */
-  deprecated override string getName() { result = this.getAbsolutePath() }
-
-  /** DEPRECATED: Use `getAbsolutePath` instead. */
-  deprecated string getFullName() { result = this.getAbsolutePath() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -115,9 +109,6 @@ private predicate occupied_line(File f, int n) {
 
 /** A folder (directory) */
 class Folder extends Container, @folder {
-  /** DEPRECATED: Use `getAbsolutePath` instead. */
-  deprecated override string getName() { result = this.getAbsolutePath() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -156,9 +147,6 @@ class Folder extends Container, @folder {
 abstract class Container extends @container {
   Container getParent() { containerparent(result, this) }
 
-  /** Gets a child of this container */
-  deprecated Container getChild() { containerparent(this, result) }
-
   /**
    * Gets a textual representation of the path of this container.
    *
@@ -166,8 +154,11 @@ abstract class Container extends @container {
    */
   string toString() { result = this.getAbsolutePath() }
 
-  /** Gets the name of this container */
-  abstract string getName();
+  /**
+   * Gets the name of this container.
+   * DEPRECATED: Use `getAbsolutePath` instead.
+   */
+  deprecated string getName() { result = this.getAbsolutePath() }
 
   /**
    * Gets the relative path of this file or folder from the root folder of the
@@ -339,7 +330,7 @@ abstract class Container extends @container {
    * paths. The list of paths is composed of the paths passed to the extractor and
    * `sys.path`.
    */
-  predicate isImportRoot(int n) { this.getName() = import_path_element(n) }
+  predicate isImportRoot(int n) { this.getAbsolutePath() = import_path_element(n) }
 
   /** Holds if this folder is the root folder for the standard library. */
   predicate isStdLibRoot(int major, int minor) {
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
index ab3d0a5f393..3b90e6f8c88 100755
--- a/python/ql/lib/semmle/python/Flow.qll
+++ b/python/ql/lib/semmle/python/Flow.qll
@@ -82,30 +82,12 @@ class ControlFlowNode extends @py_flow_node {
     toAst(this) instanceof NameConstant
   }
 
-  /** Use NameNode.isLoad() instead */
-  deprecated predicate isUse() { toAst(this) instanceof Name and this.isLoad() }
-
-  /** Use NameNode.isStore() */
-  deprecated predicate isDefinition() { toAst(this) instanceof Name and this.isStore() }
-
   /** Whether this flow node corresponds to an attribute expression */
   predicate isAttribute() { toAst(this) instanceof Attribute }
 
-  /** Use AttrNode.isLoad() instead */
-  deprecated predicate isAttributeLoad() { toAst(this) instanceof Attribute and this.isLoad() }
-
-  /** Use AttrNode.isStore() instead */
-  deprecated predicate isAttributeStore() { toAst(this) instanceof Attribute and this.isStore() }
-
   /** Whether this flow node corresponds to an subscript expression */
   predicate isSubscript() { toAst(this) instanceof Subscript }
 
-  /** Use SubscriptNode.isLoad() instead */
-  deprecated predicate isSubscriptLoad() { toAst(this) instanceof Subscript and this.isLoad() }
-
-  /** Use SubscriptNode.isStore() instead */
-  deprecated predicate isSubscriptStore() { toAst(this) instanceof Subscript and this.isStore() }
-
   /** Whether this flow node corresponds to an import member */
   predicate isImportMember() { toAst(this) instanceof ImportMember }
 
@@ -155,7 +137,7 @@ class ControlFlowNode extends @py_flow_node {
   /** Whether this flow node is the first in its scope */
   predicate isEntryNode() { py_scope_flow(this, _, -1) }
 
-  /** The value that this ControlFlowNode points-to. */
+  /** Gets the value that this ControlFlowNode points-to. */
   predicate pointsTo(Value value) { this.pointsTo(_, value, _) }
 
   /** Gets the value that this ControlFlowNode points-to. */
@@ -164,10 +146,10 @@ class ControlFlowNode extends @py_flow_node {
   /** Gets a value that this ControlFlowNode may points-to. */
   Value inferredValue() { this.pointsTo(_, result, _) }
 
-  /** The value and origin that this ControlFlowNode points-to. */
+  /** Gets the value and origin that this ControlFlowNode points-to. */
   predicate pointsTo(Value value, ControlFlowNode origin) { this.pointsTo(_, value, origin) }
 
-  /** The value and origin that this ControlFlowNode points-to, given the context. */
+  /** Gets the value and origin that this ControlFlowNode points-to, given the context. */
   predicate pointsTo(Context context, Value value, ControlFlowNode origin) {
     PointsTo::pointsTo(this, context, value, origin)
   }
@@ -317,7 +299,7 @@ class ControlFlowNode extends @py_flow_node {
     exists(BasicBlock b, int i, int j | this = b.getNode(i) and other = b.getNode(j) and i < j)
   }
 
-  /* Holds if this CFG node is a branch */
+  /** Holds if this CFG node is a branch */
   predicate isBranch() { py_true_successors(this, _) or py_false_successors(this, _) }
 
   ControlFlowNode getAChild() { result = this.getExprChild(this.getBasicBlock()) }
@@ -439,12 +421,6 @@ class AttrNode extends ControlFlowNode {
     )
   }
 
-  /** Use getObject() instead */
-  deprecated ControlFlowNode getValue() { result = this.getObject() }
-
-  /** Use getObject(name) instead */
-  deprecated ControlFlowNode getValue(string name) { result = this.getObject(name) }
-
   /**
    * Gets the flow node corresponding to the object of the attribute expression corresponding to this flow node,
    * with the matching name
@@ -507,18 +483,6 @@ class ImportStarNode extends ControlFlowNode {
 class SubscriptNode extends ControlFlowNode {
   SubscriptNode() { toAst(this) instanceof Subscript }
 
-  /**
-   * DEPRECATED: Use `getObject()` instead.
-   * This will be formally deprecated before the end 2018 and removed in 2019.
-   */
-  deprecated ControlFlowNode getValue() {
-    exists(Subscript s |
-      this.getNode() = s and
-      s.getObject() = result.getNode() and
-      result.getBasicBlock().dominates(this.getBasicBlock())
-    )
-  }
-
   /** flow node corresponding to the value of the sequence in a subscript operation */
   ControlFlowNode getObject() {
     exists(Subscript s |
@@ -950,10 +914,6 @@ class NameNode extends ControlFlowNode {
 /** A control flow node corresponding to a named constant, one of `None`, `True` or `False`. */
 class NameConstantNode extends NameNode {
   NameConstantNode() { exists(NameConstant n | py_flow_bb_node(this, n, _, _)) }
-
-  deprecated override predicate defines(Variable v) { none() }
-
-  deprecated override predicate deletes(Variable v) { none() }
   /*
    * We ought to override uses as well, but that has
    * a serious performance impact.
@@ -1009,12 +969,6 @@ private module Scopes {
     scope = n.getEnclosingModule()
   }
 
-  private predicate maybe_defined(SsaVariable var) {
-    exists(var.getDefinition()) and not py_ssa_phi(var, _) and not var.getDefinition().isDelete()
-    or
-    exists(SsaVariable input | input = var.getAPhiInput() | maybe_defined(input))
-  }
-
   private predicate maybe_undefined(SsaVariable var) {
     not exists(var.getDefinition()) and not py_ssa_phi(var, _)
     or
diff --git a/python/ql/lib/semmle/python/Frameworks.qll b/python/ql/lib/semmle/python/Frameworks.qll
index 797f861d8e6..b94b8aee5d9 100644
--- a/python/ql/lib/semmle/python/Frameworks.qll
+++ b/python/ql/lib/semmle/python/Frameworks.qll
@@ -19,11 +19,13 @@ private import semmle.python.frameworks.FastApi
 private import semmle.python.frameworks.Flask
 private import semmle.python.frameworks.FlaskAdmin
 private import semmle.python.frameworks.FlaskSqlAlchemy
+private import semmle.python.frameworks.Httpx
 private import semmle.python.frameworks.Idna
 private import semmle.python.frameworks.Invoke
 private import semmle.python.frameworks.Jmespath
 private import semmle.python.frameworks.Ldap
 private import semmle.python.frameworks.Ldap3
+private import semmle.python.frameworks.Libtaxii
 private import semmle.python.frameworks.Libxml2
 private import semmle.python.frameworks.Lxml
 private import semmle.python.frameworks.MarkupSafe
@@ -32,6 +34,7 @@ private import semmle.python.frameworks.Mysql
 private import semmle.python.frameworks.MySQLdb
 private import semmle.python.frameworks.Peewee
 private import semmle.python.frameworks.Psycopg2
+private import semmle.python.frameworks.Pycurl
 private import semmle.python.frameworks.Pydantic
 private import semmle.python.frameworks.PyMySQL
 private import semmle.python.frameworks.Requests
@@ -46,5 +49,6 @@ private import semmle.python.frameworks.Toml
 private import semmle.python.frameworks.Tornado
 private import semmle.python.frameworks.Twisted
 private import semmle.python.frameworks.Ujson
+private import semmle.python.frameworks.Urllib3
 private import semmle.python.frameworks.Yaml
 private import semmle.python.frameworks.Yarl
diff --git a/python/ql/lib/semmle/python/Function.qll b/python/ql/lib/semmle/python/Function.qll
index 0397eea605b..05111d3d749 100644
--- a/python/ql/lib/semmle/python/Function.qll
+++ b/python/ql/lib/semmle/python/Function.qll
@@ -5,11 +5,11 @@ import python
  * It is the syntactic entity that is compiled to a code object.
  */
 class Function extends Function_, Scope, AstNode {
-  /** The expression defining this function */
+  /** Gets the expression defining this function */
   CallableExpr getDefinition() { result = this.getParent() }
 
   /**
-   * The scope in which this function occurs, will be a class for a method,
+   * Gets the scope in which this function occurs. This will be a class for a method,
    * another function for nested functions, generator expressions or comprehensions,
    * or a module for a plain function.
    */
@@ -183,8 +183,8 @@ class FunctionDef extends Assign {
   override Stmt getLastStatement() { result = this.getDefinedFunction().getLastStatement() }
 }
 
+/** A function that uses 'fast' locals, stored in the frame not in a dictionary. */
 class FastLocalsFunction extends Function {
-  /** A function that uses 'fast' locals, stored in the frame not in a dictionary. */
   FastLocalsFunction() {
     not exists(ImportStar i | i.getScope() = this) and
     not exists(Exec e | e.getScope() = this)
diff --git a/python/ql/lib/semmle/python/Import.qll b/python/ql/lib/semmle/python/Import.qll
index 9620b01e4c6..aa0bb318c1b 100644
--- a/python/ql/lib/semmle/python/Import.qll
+++ b/python/ql/lib/semmle/python/Import.qll
@@ -35,6 +35,8 @@ class ImportExpr extends ImportExpr_ {
   }
 
   /**
+   * Gets the level of this import.
+   *
    * The language specifies level as -1 if relative imports are to be tried first, 0 for absolute imports,
    * and level > 0 for explicit relative imports.
    */
@@ -165,13 +167,6 @@ class Import extends Import_ {
     result = this.getAName().getValue().(ImportMember).getModule()
   }
 
-  /**
-   * Use getAnImportedModuleName(),
-   * possibly combined with ModuleObject.importedAs()
-   * Gets a module imported by this import statement
-   */
-  deprecated Module getAModule() { result.getName() = this.getAnImportedModuleName() }
-
   /** Whether this a `from ... import ...` statement */
   predicate isFromImport() { this.getAName().getValue() instanceof ImportMember }
 
@@ -216,13 +211,6 @@ class ImportStar extends ImportStar_ {
 
   override string toString() { result = "from " + this.getModuleExpr().getName() + " import *" }
 
-  /**
-   * Use getAnImportedModuleName(),
-   * possibly combined with ModuleObject.importedAs()
-   * Gets the module imported by this import * statement
-   */
-  deprecated Module getTheModule() { result.getName() = this.getImportedModuleName() }
-
   override Expr getASubExpression() { result = this.getModule() }
 
   override Stmt getASubStatement() { none() }
diff --git a/python/ql/lib/semmle/python/Metrics.qll b/python/ql/lib/semmle/python/Metrics.qll
index 1526578f6c2..e5130ba000f 100644
--- a/python/ql/lib/semmle/python/Metrics.qll
+++ b/python/ql/lib/semmle/python/Metrics.qll
@@ -18,7 +18,7 @@ class FunctionMetrics extends Function {
   int getNumberOfLinesOfDocStrings() { py_docstringlines(this, result) }
 
   /**
-   * Cyclomatic complexity:
+   * Gets the cyclomatic complexity of the function:
    * The number of linearly independent paths through the source code.
    * Computed as     E - N + 2P,
    * where
@@ -27,9 +27,9 @@ class FunctionMetrics extends Function {
    *  P = the number of connected components, which for a single function is 1.
    */
   int getCyclomaticComplexity() {
-    exists(int E, int N |
-      N = count(BasicBlock b | b = this.getABasicBlock() and b.likelyReachable()) and
-      E =
+    exists(int e, int n |
+      n = count(BasicBlock b | b = this.getABasicBlock() and b.likelyReachable()) and
+      e =
         count(BasicBlock b1, BasicBlock b2 |
           b1 = this.getABasicBlock() and
           b1.likelyReachable() and
@@ -39,7 +39,7 @@ class FunctionMetrics extends Function {
           not b1.unlikelySuccessor(b2)
         )
     |
-      result = E - N + 2
+      result = e - n + 2
     )
   }
 
@@ -130,13 +130,13 @@ class ClassMetrics extends Class {
   }
 
   /**
-   * The afferent coupling of a class is the number of classes that
+   * Gets the afferent coupling of a class -- the number of classes that
    * directly depend on it.
    */
   int getAfferentCoupling() { result = count(ClassMetrics t | t.dependsOn(this)) }
 
   /**
-   * The efferent coupling of a class is the number of classes that
+   * Gets the efferent coupling of a class -- the number of classes that
    * it directly depends on.
    */
   int getEfferentCoupling() { result = count(ClassMetrics t | this.dependsOn(t)) }
@@ -273,13 +273,13 @@ class ModuleMetrics extends Module {
   int getNumberOfLinesOfDocStrings() { py_docstringlines(this, result) }
 
   /**
-   * The afferent coupling of a class is the number of classes that
+   * Gets the afferent coupling of a class -- the number of classes that
    *  directly depend on it.
    */
   int getAfferentCoupling() { result = count(ModuleMetrics t | t.dependsOn(this)) }
 
   /**
-   * The efferent coupling of a class is the number of classes that
+   * Gets the efferent coupling of a class -- the number of classes that
    *  it directly depends on.
    */
   int getEfferentCoupling() { result = count(ModuleMetrics t | this.dependsOn(t)) }
diff --git a/python/ql/lib/semmle/python/Module.qll b/python/ql/lib/semmle/python/Module.qll
index 6baf41b4a03..775e3df2069 100644
--- a/python/ql/lib/semmle/python/Module.qll
+++ b/python/ql/lib/semmle/python/Module.qll
@@ -22,12 +22,13 @@ class Module extends Module_, Scope, AstNode {
   }
 
   /**
+   * Gets the enclosing scope of this module (always none).
+   *
    * This method will be deprecated in the next release. Please use `getEnclosingScope()` instead.
-   * The enclosing scope of this module (always none)
    */
   override Scope getScope() { none() }
 
-  /** The enclosing scope of this module (always none) */
+  /** Gets the enclosing scope of this module (always none) */
   override Scope getEnclosingScope() { none() }
 
   /** Gets the statements forming the body of this module */
@@ -98,12 +99,6 @@ class Module extends Module_, Scope, AstNode {
   /** Gets the metrics for this module */
   ModuleMetrics getMetrics() { result = this }
 
-  /**
-   * Use ModuleObject.getAnImportedModule() instead.
-   * Gets a module imported by this module
-   */
-  deprecated Module getAnImportedModule() { result.getName() = this.getAnImportedModuleName() }
-
   string getAnImportedModuleName() {
     exists(Import i | i.getEnclosingModule() = this | result = i.getAnImportedModuleName())
     or
@@ -196,7 +191,7 @@ private predicate isPotentialSourcePackage(Folder f) {
 private predicate isPotentialPackage(Folder f) {
   exists(f.getFile("__init__.py"))
   or
-  py_flags_versioned("options.respect_init", "False", _) and major_version() = 2
+  py_flags_versioned("options.respect_init", "False", _) and major_version() = 2 and exists(f)
 }
 
 private string moduleNameFromBase(Container file) {
diff --git a/python/ql/lib/semmle/python/Operations.qll b/python/ql/lib/semmle/python/Operations.qll
index 7cd427fc684..e8f5e4799a5 100644
--- a/python/ql/lib/semmle/python/Operations.qll
+++ b/python/ql/lib/semmle/python/Operations.qll
@@ -1,6 +1,6 @@
 import python
 
-/** Base class for operators */
+/** The base class for operators */
 class Operator extends Operator_ {
   /** Gets the name of the special method used to implement this operator */
   string getSpecialMethodName() { none() }
@@ -131,7 +131,7 @@ class Compare extends Compare_ {
   }
 }
 
-/** List of comparison operators in a comparison */
+/** A list of comparison operators in a comparison */
 class CmpopList extends CmpopList_ { }
 
 /** A comparison operator */
diff --git a/python/ql/lib/semmle/python/Scope.qll b/python/ql/lib/semmle/python/Scope.qll
index 60e69673bbe..83279b7e261 100755
--- a/python/ql/lib/semmle/python/Scope.qll
+++ b/python/ql/lib/semmle/python/Scope.qll
@@ -9,11 +9,12 @@ class Scope extends Scope_ {
   Module getEnclosingModule() { result = this.getEnclosingScope().getEnclosingModule() }
 
   /**
+   * Gets the scope enclosing this scope (modules have no enclosing scope).
+   *
    * This method will be deprecated in the next release. Please use `getEnclosingScope()` instead.
    * The reason for this is to avoid confusion around use of `x.getScope+()` where `x` might be an
    * `AstNode` or a `Variable`. Forcing the users to write `x.getScope().getEnclosingScope*()` ensures that
    * the apparent semantics and the actual semantics coincide.
-   * [ Gets the scope enclosing this scope (modules have no enclosing scope) ]
    */
   Scope getScope() { none() }
 
diff --git a/python/ql/lib/semmle/python/SelfAttribute.qll b/python/ql/lib/semmle/python/SelfAttribute.qll
index 6fe5942a128..5926136d7ef 100644
--- a/python/ql/lib/semmle/python/SelfAttribute.qll
+++ b/python/ql/lib/semmle/python/SelfAttribute.qll
@@ -31,7 +31,7 @@ private predicate self_attribute(Attribute attr, Class cls) {
   )
 }
 
-/** Helper class for UndefinedClassAttribute.ql &amp; MaybeUndefinedClassAttribute.ql */
+/** A helper class for UndefinedClassAttribute.ql &amp; MaybeUndefinedClassAttribute.ql */
 class SelfAttributeRead extends SelfAttribute {
   SelfAttributeRead() {
     this.getCtx() instanceof Load and
diff --git a/python/ql/lib/semmle/python/SpecialMethods.qll b/python/ql/lib/semmle/python/SpecialMethods.qll
index b548e7a52a3..afa9367c269 100644
--- a/python/ql/lib/semmle/python/SpecialMethods.qll
+++ b/python/ql/lib/semmle/python/SpecialMethods.qll
@@ -112,6 +112,6 @@ class SpecialMethodCallNode extends PotentialSpecialMethodCallNode {
     )
   }
 
-  /** The method that is called. */
+  /** Gets the method that is called. */
   Value getResolvedSpecialMethod() { result = resolvedSpecialMethod }
 }
diff --git a/python/ql/lib/semmle/python/Stmts.qll b/python/ql/lib/semmle/python/Stmts.qll
index 9ffaef81ab2..1138fed1d3e 100644
--- a/python/ql/lib/semmle/python/Stmts.qll
+++ b/python/ql/lib/semmle/python/Stmts.qll
@@ -323,7 +323,7 @@ class Raise extends Raise_ {
   override Expr getASubExpression() { py_exprs(result, _, this, _) }
 
   /**
-   * The expression immediately following the `raise`, this is the
+   * Gets the expression immediately following the `raise`. This is the
    * exception raised, but not accounting for tuples in Python 2.
    */
   Expr getException() {
@@ -332,7 +332,7 @@ class Raise extends Raise_ {
     result = this.getExc()
   }
 
-  /** The exception raised, accounting for tuples in Python 2. */
+  /** Gets the exception raised, accounting for tuples in Python 2. */
   Expr getRaised() {
     exists(Expr raw | raw = this.getException() |
       if not major_version() = 2 or not exists(raw.(Tuple).getAnElt())
diff --git a/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll b/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
index 79931f4b543..be51b99b4c0 100644
--- a/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
@@ -227,7 +227,7 @@ private module SensitiveDataModeling {
   }
 
   /**
-   * Any kind of variable assignment (also including with/for) where the name indicates
+   * A variable assignment (also including with/for) where the name indicates
    * it contains sensitive data.
    *
    * Note: We _could_ make any access to a variable with a sensitive name a source of
diff --git a/python/ql/lib/semmle/python/dataflow/new/TypeTracker.qll b/python/ql/lib/semmle/python/dataflow/new/TypeTracker.qll
index e46c66082b2..a27c33145f0 100644
--- a/python/ql/lib/semmle/python/dataflow/new/TypeTracker.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/TypeTracker.qll
@@ -6,14 +6,14 @@
 private import python
 private import internal.TypeTracker as Internal
 
-/** Any string that may appear as the name of an attribute or access path. */
+/** A string that may appear as the name of an attribute or access path. */
 class AttributeName = Internal::ContentName;
 
-/** Either an attribute name, or the empty string (representing no attribute). */
+/** An attribute name, or the empty string (representing no attribute). */
 class OptionalAttributeName = Internal::OptionalContentName;
 
 /**
- * Summary of the steps needed to track a value to a given dataflow node.
+ * The summary of the steps needed to track a value to a given dataflow node.
  *
  * This can be used to track objects that implement a certain API in order to
  * recognize calls to that API. Note that type-tracking does not by itself provide a
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 1d40cfcaf89..f362c919112 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -39,8 +39,11 @@ predicate isArgumentNode(ArgumentNode arg, DataFlowCall c, ArgumentPosition pos)
 //--------
 predicate isExpressionNode(ControlFlowNode node) { node.getNode() instanceof Expr }
 
+/** DEPRECATED: Alias for `SyntheticPreUpdateNode` */
+deprecated module syntheticPreUpdateNode = SyntheticPreUpdateNode;
+
 /** A module collecting the different reasons for synthesising a pre-update node. */
-module syntheticPreUpdateNode {
+module SyntheticPreUpdateNode {
   class SyntheticPreUpdateNode extends Node, TSyntheticPreUpdateNode {
     NeedsSyntheticPreUpdateNode post;
 
@@ -63,7 +66,7 @@ module syntheticPreUpdateNode {
     override Node getPreUpdateNode() { result.(SyntheticPreUpdateNode).getPostUpdateNode() = this }
 
     /**
-     * A label for this kind of node. This will figure in the textual representation of the synthesized pre-update node.
+     * Gets the label for this kind of node. This will figure in the textual representation of the synthesized pre-update node.
      *
      * There is currently only one reason for needing a pre-update node, so we always use that as the label.
      */
@@ -78,10 +81,13 @@ module syntheticPreUpdateNode {
   CfgNode objectCreationNode() { result.getNode().(CallNode) = any(ClassCall c).getNode() }
 }
 
-import syntheticPreUpdateNode
+import SyntheticPreUpdateNode
+
+/** DEPRECATED: Alias for `SyntheticPostUpdateNode` */
+deprecated module syntheticPostUpdateNode = SyntheticPostUpdateNode;
 
 /** A module collecting the different reasons for synthesising a post-update node. */
-module syntheticPostUpdateNode {
+module SyntheticPostUpdateNode {
   /** A post-update node is synthesized for all nodes which satisfy `NeedsSyntheticPostUpdateNode`. */
   class SyntheticPostUpdateNode extends PostUpdateNode, TSyntheticPostUpdateNode {
     NeedsSyntheticPostUpdateNode pre;
@@ -108,7 +114,7 @@ module syntheticPostUpdateNode {
     }
 
     /**
-     * A label for this kind of node. This will figure in the textual representation of the synthesized post-update node.
+     * Gets the label for this kind of node. This will figure in the textual representation of the synthesized post-update node.
      * We favour being an arguments as the reason for the post-update node in case multiple reasons apply.
      */
     string label() {
@@ -122,6 +128,8 @@ module syntheticPostUpdateNode {
   }
 
   /**
+   * Gets the pre-update node for this node.
+   *
    * An argument might have its value changed as a result of a call.
    * Certain arguments, such as implicit self arguments are already post-update nodes
    * and should not have an extra node synthesised.
@@ -143,7 +151,7 @@ module syntheticPostUpdateNode {
     )
   }
 
-  /** An object might have its value changed after a store. */
+  /** Gets the pre-update node associated with a store. This is used for when an object might have its value changed after a store. */
   CfgNode storePreUpdateNode() {
     exists(Attribute a |
       result.getNode() = a.getObject().getAFlowNode() and
@@ -152,7 +160,7 @@ module syntheticPostUpdateNode {
   }
 
   /**
-   * A node marking the state change of an object after a read.
+   * Gets a node marking the state change of an object after a read.
    *
    * A reverse read happens when the result of a read is modified, e.g. in
    * ```python
@@ -175,7 +183,7 @@ module syntheticPostUpdateNode {
   }
 }
 
-import syntheticPostUpdateNode
+import SyntheticPostUpdateNode
 
 class DataFlowExpr = Expr;
 
@@ -611,7 +619,7 @@ newtype TDataFlowCallable =
   TLambda(Function lambda) { lambda.isLambda() } or
   TModule(Module m)
 
-/** Represents a callable. */
+/** A callable. */
 abstract class DataFlowCallable extends TDataFlowCallable {
   /** Gets a textual representation of this element. */
   abstract string toString();
@@ -712,7 +720,7 @@ newtype TDataFlowCall =
   TClassCall(CallNode call) { call = any(ClassValue c | not c.isAbsent()).getACall() } or
   TSpecialCall(SpecialMethodCallNode special)
 
-/** Represents a call. */
+/** A call. */
 abstract class DataFlowCall extends TDataFlowCall {
   /** Gets a textual representation of this element. */
   abstract string toString();
@@ -737,7 +745,7 @@ abstract class DataFlowCall extends TDataFlowCall {
 }
 
 /**
- * Represents a call to a function/lambda.
+ * A call to a function/lambda.
  * This excludes calls to bound methods, classes, and special methods.
  * Bound method calls and class calls insert an argument for the explicit
  * `self` parameter, and special method calls have special argument passing.
@@ -824,7 +832,7 @@ class ClassCall extends DataFlowCall, TClassCall {
   override DataFlowCallable getEnclosingCallable() { result.getScope() = call.getScope() }
 }
 
-/** Represents a call to a special method. */
+/** A call to a special method. */
 class SpecialCall extends DataFlowCall, TSpecialCall {
   SpecialMethodCallNode special;
 
@@ -1617,6 +1625,8 @@ import IterableUnpacking
  */
 module MatchUnpacking {
   /**
+   * Holds when there is flow from the subject `nodeFrom` to the (top-level) pattern `nodeTo` of a `match` statement.
+   *
    * The subject of a match flows to each top-level pattern
    * (a pattern directly under a `case` statement).
    *
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
index a77a0659f3b..c463d213920 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
@@ -34,7 +34,8 @@ private module Cached {
     CallStep() or
     ReturnStep() or
     StoreStep(ContentName content) or
-    LoadStep(ContentName content)
+    LoadStep(ContentName content) or
+    JumpStep()
 
   /** Gets the summary resulting from appending `step` to type-tracking summary `tt`. */
   cached
@@ -49,6 +50,9 @@ private module Cached {
       step = LoadStep(content) and result = MkTypeTracker(hasCall, "")
       or
       exists(string p | step = StoreStep(p) and content = "" and result = MkTypeTracker(hasCall, p))
+      or
+      step = JumpStep() and
+      result = MkTypeTracker(false, content)
     )
   }
 
@@ -67,6 +71,9 @@ private module Cached {
       )
       or
       step = StoreStep(content) and result = MkTypeBackTracker(hasReturn, "")
+      or
+      step = JumpStep() and
+      result = MkTypeBackTracker(false, content)
     )
   }
 
@@ -110,12 +117,17 @@ class StepSummary extends TStepSummary {
     exists(string content | this = StoreStep(content) | result = "store " + content)
     or
     exists(string content | this = LoadStep(content) | result = "load " + content)
+    or
+    this instanceof JumpStep and result = "jump"
   }
 }
 
 pragma[noinline]
 private predicate smallstepNoCall(Node nodeFrom, TypeTrackingNode nodeTo, StepSummary summary) {
   jumpStep(nodeFrom, nodeTo) and
+  summary = JumpStep()
+  or
+  levelStep(nodeFrom, nodeTo) and
   summary = LevelStep()
   or
   exists(string content |
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
index ac7d4ca5e3c..324e53a54ff 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
@@ -14,6 +14,9 @@ predicate simpleLocalFlowStep = DataFlowPrivate::simpleLocalFlowStep/2;
 
 predicate jumpStep = DataFlowPrivate::jumpStep/2;
 
+/** Holds if there is a level step from `pred` to `succ`. */
+predicate levelStep(Node pred, Node succ) { none() }
+
 /**
  * Gets the name of a possible piece of content. For Python, this is currently only attribute names,
  * using the name of the attribute for the corresponding content.
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/python/ql/lib/semmle/python/dataflow/old/Configuration.qll b/python/ql/lib/semmle/python/dataflow/old/Configuration.qll
index 04d89265f2a..7d03e6c562f 100644
--- a/python/ql/lib/semmle/python/dataflow/old/Configuration.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/Configuration.qll
@@ -119,16 +119,6 @@ module TaintTracking {
       this.(TaintTrackingImplementation).hasFlowPath(src, sink)
     }
 
-    /* Old query API */
-    /* deprecated */
-    deprecated predicate hasFlow(Source src, Sink sink) {
-      exists(PathSource psrc, PathSink psink |
-        this.hasFlowPath(psrc, psink) and
-        src = psrc.getNode().asCfgNode() and
-        sink = psink.getNode().asCfgNode()
-      )
-    }
-
     /* New query API */
     predicate hasSimpleFlow(DataFlow::Node src, DataFlow::Node sink) {
       exists(PathSource psrc, PathSink psink |
diff --git a/python/ql/lib/semmle/python/dataflow/old/Implementation.qll b/python/ql/lib/semmle/python/dataflow/old/Implementation.qll
index 84e61e30b2d..796dc743478 100644
--- a/python/ql/lib/semmle/python/dataflow/old/Implementation.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/Implementation.qll
@@ -79,7 +79,7 @@ abstract class AttributePath extends TAttributePath {
   predicate noAttribute() { this = TNoAttribute() }
 }
 
-/** AttributePath for no attribute. */
+/** The `AttributePath` for no attribute. */
 class NoAttribute extends TNoAttribute, AttributePath {
   override string toString() { result = "no attribute" }
 
@@ -88,7 +88,7 @@ class NoAttribute extends TNoAttribute, AttributePath {
   override AttributePath fromAttribute(string name) { none() }
 }
 
-/** AttributePath for an attribute. */
+/** The `AttributePath` for an attribute. */
 class NamedAttributePath extends TAttribute, AttributePath {
   override string toString() {
     exists(string attr |
@@ -124,8 +124,8 @@ newtype TTaintTrackingNode =
   }
 
 /**
- * Class representing the (node, context, path, kind) tuple.
- *  Used for context-sensitive path-aware taint-tracking.
+ * A class representing the (node, context, path, kind) tuple.
+ * Used for context-sensitive path-aware taint-tracking.
  */
 class TaintTrackingNode extends TTaintTrackingNode {
   /** Gets a textual representation of this element. */
@@ -900,22 +900,6 @@ private class EssaTaintTracking extends string {
     or
     result = this.testEvaluates(defn, not_operand(test), use, src).booleanNot()
   }
-
-  /**
-   * Holds if `test` is the test in a branch and `use` is that test
-   * with all the `not` prefixes removed.
-   */
-  private predicate boolean_filter(ControlFlowNode test, ControlFlowNode use) {
-    any(PyEdgeRefinement ref).getTest() = test and
-    (
-      use = test
-      or
-      exists(ControlFlowNode notuse |
-        this.boolean_filter(test, notuse) and
-        use = not_operand(notuse)
-      )
-    )
-  }
 }
 
 private predicate testEvaluatesMaybe(ControlFlowNode test, ControlFlowNode use) {
@@ -991,7 +975,7 @@ int iterable_unpacking_descent(SequenceNode left_parent, ControlFlowNode left_de
 }
 
 module Implementation {
-  /* A call that returns a copy (or similar) of the argument */
+  /** Holds if `tonode` is a call that returns a copy (or similar) of the argument `fromnode` */
   predicate copyCall(ControlFlowNode fromnode, CallNode tonode) {
     tonode.getFunction().(AttrNode).getObject("copy") = fromnode
     or
diff --git a/python/ql/lib/semmle/python/dataflow/old/Legacy.qll b/python/ql/lib/semmle/python/dataflow/old/Legacy.qll
index df0649963d0..091ade3a825 100644
--- a/python/ql/lib/semmle/python/dataflow/old/Legacy.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/Legacy.qll
@@ -2,24 +2,7 @@ import semmle.python.dataflow.TaintTracking
 private import semmle.python.objects.ObjectInternal
 import semmle.python.dataflow.Implementation
 
-/* For backwards compatibility -- Use `TaintTrackingContext` instead. */
-deprecated class CallContext extends TaintTrackingContext {
-  TaintTrackingContext getCallee(CallNode call) { result.getCaller(call) = this }
-
-  predicate appliesToScope(Scope s) {
-    exists(PythonFunctionObjectInternal func, TaintKind param, AttributePath path, int n |
-      this = TParamContext(param, path, n) and
-      exists(TaintTrackingImplementation impl |
-        impl.callWithTaintedArgument(_, _, _, func, n, path, param) and
-        s = func.getScope()
-      )
-    )
-    or
-    this.isTop()
-  }
-}
-
-/* Backwards compatibility with config-less taint-tracking */
+/** A configuration that provides backwards compatibility with config-less taint-tracking */
 private class LegacyConfiguration extends TaintTracking::Configuration {
   LegacyConfiguration() {
     /* A name that won't be accidentally chosen by users */
diff --git a/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll b/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll
index 8ed6711ba38..22832b46c6c 100755
--- a/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll
@@ -138,9 +138,6 @@ abstract class TaintKind extends string {
     exists(TaintedNode n | n.getTaintKind() = this and n.getCfgNode() = expr)
   }
 
-  /** DEPRECATED -- Use getType() instead */
-  deprecated ClassObject getClass() { none() }
-
   /**
    * Gets the class of this kind of taint.
    * For example, if this were a kind of string taint
@@ -180,7 +177,7 @@ abstract class TaintKind extends string {
 }
 
 /**
- * Alias of `TaintKind`, so the two types can be used interchangeably.
+ * An Alias of `TaintKind`, so the two types can be used interchangeably.
  */
 class FlowLabel = TaintKind;
 
@@ -561,7 +558,7 @@ module DataFlowExtension {
     ControlFlowNode getACalleeSuccessorNode(CallNode call) { none() }
   }
 
-  /** Data flow variable that modifies the basic data-flow. */
+  /** A data flow variable that modifies the basic data-flow. */
   class DataFlowVariable extends EssaVariable {
     /**
      * Gets a successor node for data-flow.
@@ -608,49 +605,11 @@ private import semmle.python.pointsto.PointsTo
  */
 module DataFlow {
   /**
-   * Generic taint kind, source and sink classes for convenience and
+   * The generic taint kind, source and sink classes for convenience and
    * compatibility with other language libraries
    */
   class Extension = DataFlowExtension::DataFlowNode;
 
-  abstract deprecated class Configuration extends string {
-    bindingset[this]
-    Configuration() { this = this }
-
-    abstract predicate isSource(ControlFlowNode source);
-
-    abstract predicate isSink(ControlFlowNode sink);
-
-    private predicate hasFlowPath(TaintedNode source, TaintedNode sink) {
-      source.getConfiguration() = this and
-      this.isSource(source.getCfgNode()) and
-      this.isSink(sink.getCfgNode()) and
-      source.flowsTo(sink)
-    }
-
-    predicate hasFlow(ControlFlowNode source, ControlFlowNode sink) {
-      exists(TaintedNode psource, TaintedNode psink |
-        psource.getCfgNode() = source and
-        psink.getCfgNode() = sink and
-        this.isSource(source) and
-        this.isSink(sink) and
-        this.hasFlowPath(psource, psink)
-      )
-    }
-  }
-
-  deprecated private class ConfigurationAdapter extends TaintTracking::Configuration instanceof Configuration {
-    override predicate isSource(DataFlow::Node node, TaintKind kind) {
-      Configuration.super.isSource(node.asCfgNode()) and
-      kind instanceof DataFlowType
-    }
-
-    override predicate isSink(DataFlow::Node node, TaintKind kind) {
-      Configuration.super.isSink(node.asCfgNode()) and
-      kind instanceof DataFlowType
-    }
-  }
-
   private newtype TDataFlowNode =
     TEssaNode(EssaVariable var) or
     TCfgNode(ControlFlowNode node)
@@ -670,9 +629,6 @@ module DataFlow {
     abstract Location getLocation();
 
     AstNode asAstNode() { result = this.asCfgNode().getNode() }
-
-    /** For backwards compatibility -- Use asAstNode() instead */
-    deprecated AstNode getNode() { result = this.asAstNode() }
   }
 
   class CfgNode extends Node, TCfgNode {
@@ -709,9 +665,10 @@ module DataFlow {
 }
 
 deprecated private class DataFlowType extends TaintKind {
+  // this only exists to avoid an empty recursion error in the type checker
   DataFlowType() {
     this = "Data flow" and
-    exists(DataFlow::Configuration c)
+    1 = 2
   }
 }
 
diff --git a/python/ql/lib/semmle/python/dependencies/Dependencies.qll b/python/ql/lib/semmle/python/dependencies/Dependencies.qll
index 3c018a13837..6f70c7e4ec0 100644
--- a/python/ql/lib/semmle/python/dependencies/Dependencies.qll
+++ b/python/ql/lib/semmle/python/dependencies/Dependencies.qll
@@ -158,13 +158,13 @@ private predicate defn_of_instance_attribute(Assign asgn, Class c, string name)
   )
 }
 
-/* Whether asgn defines an attribute of a class */
+/** Holds if asgn defines an attribute of a class */
 private predicate defn_of_class_attribute(Assign asgn, Class c, string name) {
   asgn.getScope() = c and
   asgn.getATarget().(Name).getId() = name
 }
 
-/* Holds if `value` is a value assigned to the `name`d attribute of module `m`. */
+/** Holds if `value` is a value assigned to the `name`d attribute of module `m`. */
 private predicate defn_of_module_attribute(ControlFlowNode value, Module m, string name) {
   exists(DefinitionNode def |
     def.getScope() = m and
diff --git a/python/ql/lib/semmle/python/essa/Essa.qll b/python/ql/lib/semmle/python/essa/Essa.qll
index 90a9e0e2ad9..fb5e0bf0843 100644
--- a/python/ql/lib/semmle/python/essa/Essa.qll
+++ b/python/ql/lib/semmle/python/essa/Essa.qll
@@ -134,7 +134,7 @@ private newtype TEssaDefinition =
   TPhiFunction(SsaSourceVariable v, BasicBlock b) { EssaDefinitions::phiNode(v, b) }
 
 /**
- * Definition of an extended-SSA (ESSA) variable.
+ * A definition of an extended-SSA (ESSA) variable.
  * There is exactly one definition for each variable,
  * and exactly one variable for each definition.
  */
@@ -171,6 +171,9 @@ abstract class EssaDefinition extends TEssaDefinition {
   EssaVariable getVariable() { result.getDefinition() = this }
 
   abstract BasicBlock getBasicBlock();
+
+  /** Gets the name of the primary QL class for this element. */
+  string getAPrimaryQlClass() { result = "EssaDefinition" }
 }
 
 /**
@@ -216,13 +219,15 @@ class EssaEdgeRefinement extends EssaDefinition, TEssaEdgeDefinition {
   }
 
   override string getRepresentation() {
-    result = this.getAQlClass() + "(" + this.getInput().getRepresentation() + ")"
+    result = this.getAPrimaryQlClass() + "(" + this.getInput().getRepresentation() + ")"
   }
 
   /** Gets the scope of the variable defined by this definition. */
   override Scope getScope() { result = this.getPredecessor().getScope() }
 
   override BasicBlock getBasicBlock() { result = this.getSuccessor() }
+
+  override string getAPrimaryQlClass() { result = "EssaEdgeRefinement" }
 }
 
 /** A Phi-function as specified in classic SSA form. */
@@ -366,6 +371,8 @@ class PhiFunction extends EssaDefinition, TPhiFunction {
       )
     )
   }
+
+  override string getAPrimaryQlClass() { result = "PhiFunction" }
 }
 
 /**
@@ -396,7 +403,7 @@ class EssaNodeDefinition extends EssaDefinition, TEssaNodeDefinition {
 
   override Location getLocation() { result = this.getDefiningNode().getLocation() }
 
-  override string getRepresentation() { result = this.getAQlClass() }
+  override string getRepresentation() { result = this.getAPrimaryQlClass() }
 
   override Scope getScope() {
     exists(BasicBlock defb |
@@ -414,6 +421,8 @@ class EssaNodeDefinition extends EssaDefinition, TEssaNodeDefinition {
   }
 
   override BasicBlock getBasicBlock() { result = this.getDefiningNode().getBasicBlock() }
+
+  override string getAPrimaryQlClass() { result = "EssaNodeDefinition" }
 }
 
 /** A definition of an ESSA variable that takes another ESSA variable as an input. */
@@ -448,10 +457,10 @@ class EssaNodeRefinement extends EssaDefinition, TEssaNodeRefinement {
   override Location getLocation() { result = this.getDefiningNode().getLocation() }
 
   override string getRepresentation() {
-    result = this.getAQlClass() + "(" + this.getInput().getRepresentation() + ")"
+    result = this.getAPrimaryQlClass() + "(" + this.getInput().getRepresentation() + ")"
     or
     not exists(this.getInput()) and
-    result = this.getAQlClass() + "(" + this.getSourceVariable().getName() + "??)"
+    result = this.getAPrimaryQlClass() + "(" + this.getSourceVariable().getName() + "??)"
   }
 
   override Scope getScope() {
@@ -470,6 +479,8 @@ class EssaNodeRefinement extends EssaDefinition, TEssaNodeRefinement {
   }
 
   override BasicBlock getBasicBlock() { result = this.getDefiningNode().getBasicBlock() }
+
+  override string getAPrimaryQlClass() { result = "EssaNodeRefinement" }
 }
 
 pragma[noopt]
@@ -483,12 +494,6 @@ private EssaVariable potential_input(EssaNodeRefinement ref) {
   )
 }
 
-/* For backwards compatibility */
-deprecated class PyNodeDefinition = EssaNodeDefinition;
-
-/* For backwards compatibility */
-deprecated class PyNodeRefinement = EssaNodeRefinement;
-
 /** An assignment to a variable `v = val` */
 class AssignmentDefinition extends EssaNodeDefinition {
   AssignmentDefinition() {
@@ -500,9 +505,11 @@ class AssignmentDefinition extends EssaNodeDefinition {
   }
 
   override string getRepresentation() { result = this.getValue().getNode().toString() }
+
+  override string getAPrimaryQlClass() { result = "AssignmentDefinition" }
 }
 
-/** Capture of a raised exception `except ExceptionType ex:` */
+/** A capture of a raised exception `except ExceptionType ex:` */
 class ExceptionCapture extends EssaNodeDefinition {
   ExceptionCapture() {
     SsaSource::exception_capture(this.getSourceVariable(), this.getDefiningNode())
@@ -516,6 +523,8 @@ class ExceptionCapture extends EssaNodeDefinition {
   }
 
   override string getRepresentation() { result = "except " + this.getSourceVariable().getName() }
+
+  override string getAPrimaryQlClass() { result = "ExceptionCapture" }
 }
 
 /** An assignment to a variable as part of a multiple assignment `..., v, ... = val` */
@@ -536,6 +545,8 @@ class MultiAssignmentDefinition extends EssaNodeDefinition {
     SsaSource::multi_assignment_definition(this.getSourceVariable(), this.getDefiningNode(), index,
       lhs)
   }
+
+  override string getAPrimaryQlClass() { result = "MultiAssignmentDefinition" }
 }
 
 /** A definition of a variable in a `with` statement */
@@ -543,6 +554,8 @@ class WithDefinition extends EssaNodeDefinition {
   WithDefinition() { SsaSource::with_definition(this.getSourceVariable(), this.getDefiningNode()) }
 
   override string getRepresentation() { result = "with" }
+
+  override string getAPrimaryQlClass() { result = "WithDefinition" }
 }
 
 /** A definition of a variable via a capture pattern */
@@ -552,6 +565,8 @@ class PatternCaptureDefinition extends EssaNodeDefinition {
   }
 
   override string getRepresentation() { result = "pattern capture" }
+
+  override string getAPrimaryQlClass() { result = "PatternCaptureDefinition" }
 }
 
 /** A definition of a variable via a pattern alias */
@@ -561,6 +576,8 @@ class PatternAliasDefinition extends EssaNodeDefinition {
   }
 
   override string getRepresentation() { result = "pattern alias" }
+
+  override string getAPrimaryQlClass() { result = "PatternAliasDefinition" }
 }
 
 /** A definition of a variable by declaring it as a parameter */
@@ -594,6 +611,8 @@ class ParameterDefinition extends EssaNodeDefinition {
 
   /** Gets the `Parameter` this `ParameterDefinition` represents. */
   Parameter getParameter() { result = this.getDefiningNode().getNode() }
+
+  override string getAPrimaryQlClass() { result = "ParameterDefinition" }
 }
 
 /** A deletion of a variable `del v` */
@@ -601,10 +620,12 @@ class DeletionDefinition extends EssaNodeDefinition {
   DeletionDefinition() {
     SsaSource::deletion_definition(this.getSourceVariable(), this.getDefiningNode())
   }
+
+  override string getAPrimaryQlClass() { result = "DeletionDefinition" }
 }
 
 /**
- * Definition of variable at the entry of a scope. Usually this represents the transfer of
+ * A definition of variable at the entry of a scope. Usually this represents the transfer of
  * a global or non-local variable from one scope to another.
  */
 class ScopeEntryDefinition extends EssaNodeDefinition {
@@ -614,16 +635,20 @@ class ScopeEntryDefinition extends EssaNodeDefinition {
   }
 
   override Scope getScope() { result.getEntryNode() = this.getDefiningNode() }
+
+  override string getAPrimaryQlClass() { result = "ScopeEntryDefinition" }
 }
 
-/** Possible redefinition of variable via `from ... import *` */
+/** A possible redefinition of variable via `from ... import *` */
 class ImportStarRefinement extends EssaNodeRefinement {
   ImportStarRefinement() {
     SsaSource::import_star_refinement(this.getSourceVariable(), _, this.getDefiningNode())
   }
+
+  override string getAPrimaryQlClass() { result = "ImportStarRefinement" }
 }
 
-/** Assignment of an attribute `obj.attr = val` */
+/** An assignment of an attribute `obj.attr = val` */
 class AttributeAssignment extends EssaNodeRefinement {
   AttributeAssignment() {
     SsaSource::attribute_assignment_refinement(this.getSourceVariable(), _, this.getDefiningNode())
@@ -635,12 +660,16 @@ class AttributeAssignment extends EssaNodeRefinement {
 
   override string getRepresentation() {
     result =
-      this.getAQlClass() + " '" + this.getName() + "'(" + this.getInput().getRepresentation() + ")"
+      this.getAPrimaryQlClass() + " '" + this.getName() + "'(" + this.getInput().getRepresentation()
+        + ")"
     or
     not exists(this.getInput()) and
     result =
-      this.getAQlClass() + " '" + this.getName() + "'(" + this.getSourceVariable().getName() + "??)"
+      this.getAPrimaryQlClass() + " '" + this.getName() + "'(" + this.getSourceVariable().getName() +
+        "??)"
   }
+
+  override string getAPrimaryQlClass() { result = "AttributeAssignment" }
 }
 
 /** A use of a variable as an argument, `foo(v)`, which might modify the object referred to. */
@@ -654,15 +683,19 @@ class ArgumentRefinement extends EssaNodeRefinement {
   ControlFlowNode getArgument() { result = argument }
 
   CallNode getCall() { result = this.getDefiningNode() }
+
+  override string getAPrimaryQlClass() { result = "ArgumentRefinement" }
 }
 
-/** Deletion of an attribute `del obj.attr`. */
+/** A deletion of an attribute `del obj.attr`. */
 class EssaAttributeDeletion extends EssaNodeRefinement {
   EssaAttributeDeletion() {
     SsaSource::attribute_deletion_refinement(this.getSourceVariable(), _, this.getDefiningNode())
   }
 
   string getName() { result = this.getDefiningNode().(AttrNode).getName() }
+
+  override string getAPrimaryQlClass() { result = "EssaAttributeDeletion" }
 }
 
 /** A pi-node (guard) with only one successor. */
@@ -690,10 +723,12 @@ class SingleSuccessorGuard extends EssaNodeRefinement {
     test = this.getDefiningNode() and
     SsaSource::test_refinement(this.getSourceVariable(), use, test)
   }
+
+  override string getAPrimaryQlClass() { result = "SingleSuccessorGuard" }
 }
 
 /**
- * Implicit definition of the names of sub-modules in a package.
+ * An implicit definition of the names of sub-modules in a package.
  * Although the interpreter does not pre-define these names, merely populating them
  * as they are imported, this is a good approximation for static analysis.
  */
@@ -701,11 +736,13 @@ class ImplicitSubModuleDefinition extends EssaNodeDefinition {
   ImplicitSubModuleDefinition() {
     SsaSource::init_module_submodule_defn(this.getSourceVariable(), this.getDefiningNode())
   }
+
+  override string getAPrimaryQlClass() { result = "ImplicitSubModuleDefinition" }
 }
 
 /** An implicit (possible) definition of an escaping variable at a call-site */
 class CallsiteRefinement extends EssaNodeRefinement {
-  override string toString() { result = "CallsiteRefinement" }
+  override string toString() { result = "CallSiteRefinement" }
 
   CallsiteRefinement() {
     exists(SsaSourceVariable var, ControlFlowNode defn |
@@ -718,6 +755,8 @@ class CallsiteRefinement extends EssaNodeRefinement {
   }
 
   CallNode getCall() { this.getDefiningNode() = result }
+
+  override string getAPrimaryQlClass() { result = "CallsiteRefinement" }
 }
 
 /** An implicit (possible) modification of the object referred at a method call */
@@ -728,14 +767,18 @@ class MethodCallsiteRefinement extends EssaNodeRefinement {
   }
 
   CallNode getCall() { this.getDefiningNode() = result }
+
+  override string getAPrimaryQlClass() { result = "MethodCallsiteRefinement" }
 }
 
 /** An implicit (possible) modification of `self` at a method call */
 class SelfCallsiteRefinement extends MethodCallsiteRefinement {
   SelfCallsiteRefinement() { this.getSourceVariable().(Variable).isSelf() }
+
+  override string getAPrimaryQlClass() { result = "SelfCallsiteRefinement" }
 }
 
-/** Python specific sub-class of generic EssaEdgeRefinement */
+/** A Python specific sub-class of generic EssaEdgeRefinement */
 class PyEdgeRefinement extends EssaEdgeRefinement {
   override string getRepresentation() {
     /*
@@ -750,4 +793,6 @@ class PyEdgeRefinement extends EssaEdgeRefinement {
   }
 
   ControlFlowNode getTest() { result = this.getPredecessor().getLastNode() }
+
+  override string getAPrimaryQlClass() { result = "PyEdgeRefinement" }
 }
diff --git a/python/ql/lib/semmle/python/essa/SsaCompute.qll b/python/ql/lib/semmle/python/essa/SsaCompute.qll
index ee5ac722122..fd8527e9fc4 100644
--- a/python/ql/lib/semmle/python/essa/SsaCompute.qll
+++ b/python/ql/lib/semmle/python/essa/SsaCompute.qll
@@ -139,7 +139,7 @@ private module SsaComputeImpl {
       Liveness::liveAtEntry(v, succ)
     }
 
-    /** A phi node for `v` at the beginning of basic block `b`. */
+    /** Holds if there is a phi node for `v` at the beginning of basic block `b`. */
     cached
     predicate phiNode(SsaSourceVariable v, BasicBlock b) {
       (
@@ -175,8 +175,8 @@ private module SsaComputeImpl {
   }
 
   /**
-   * A ranking of the indices `i` at which there is an SSA definition or use of
-   * `v` in the basic block `b`.
+   * Holds if the `rankix`th definition or use of the SSA variable `v` in the basic block `b` occurs
+   * at index `i`.
    *
    * Basic block indices are translated to rank indices in order to skip
    * irrelevant indices at which there is no definition or use when traversing
@@ -187,14 +187,14 @@ private module SsaComputeImpl {
     i = rank[rankix](int j | variableDef(v, _, b, j) or variableUse(v, _, b, j))
   }
 
-  /** A definition of a variable occurring at the specified rank index in basic block `b`. */
+  /** Holds if there is a definition of a variable occurring at the specified rank index in basic block `b`. */
   cached
   predicate defRank(SsaSourceVariable v, BasicBlock b, int rankix, int i) {
     variableDef(v, _, b, i) and
     defUseRank(v, b, rankix, i)
   }
 
-  /** A variable access `use` of `v` in `b` at index `i`. */
+  /** Holds if there is a variable access `use` of `v` in `b` at index `i`. */
   cached
   predicate variableUse(SsaSourceVariable v, ControlFlowNode use, BasicBlock b, int i) {
     (v.getAUse() = use or v.hasRefinement(use, _)) and
@@ -205,7 +205,7 @@ private module SsaComputeImpl {
   }
 
   /**
-   * A definition of an SSA variable occurring at the specified position.
+   * Holds if there is a definition of an SSA variable occurring at the specified position.
    * This is either a phi node, a `VariableUpdate`, or a parameter.
    */
   cached
@@ -227,7 +227,7 @@ private module SsaComputeImpl {
    * dominance.
    */
 
-  /** The maximum rank index for the given variable and basic block. */
+  /** Gets the maximum rank index for the given variable and basic block. */
   cached
   int lastRank(SsaSourceVariable v, BasicBlock b) {
     result = max(int rankix | defUseRank(v, b, rankix, _))
@@ -253,7 +253,7 @@ private module SsaComputeImpl {
     i = piIndex()
   }
 
-  /** The SSA definition reaches the rank index `rankix` in its own basic block `b`. */
+  /** Holds if the SSA definition reaches the rank index `rankix` in its own basic block `b`. */
   cached
   predicate ssaDefReachesRank(SsaSourceVariable v, BasicBlock b, int i, int rankix) {
     ssaDefRank(v, b, rankix, i)
@@ -264,7 +264,7 @@ private module SsaComputeImpl {
   }
 
   /**
-   * The SSA definition of `v` at `def` reaches `use` in the same basic block
+   * Holds if the SSA definition of `v` at `def` reaches `use` in the same basic block
    * without crossing another SSA definition of `v`.
    */
   cached
@@ -303,7 +303,7 @@ private module SsaComputeImpl {
     }
 
     /**
-     * The SSA definition of `v` at `def` reaches the end of a basic block `b`, at
+     * Holds if the SSA definition of `v` at `def` reaches the end of a basic block `b`, at
      * which point it is still live, without crossing another SSA definition of `v`.
      */
     cached
@@ -320,7 +320,7 @@ private module SsaComputeImpl {
     }
 
     /**
-     * The SSA definition of `v` at `(defbb, defindex)` reaches `use` without crossing another
+     * Holds if the SSA definition of `v` at `(defbb, defindex)` reaches `use` without crossing another
      * SSA definition of `v`.
      */
     cached
@@ -360,7 +360,7 @@ private module SsaComputeImpl {
       i = rank[rankix](int j | variableDefine(v, _, b, j) or variableSourceUse(v, _, b, j))
     }
 
-    /** A variable access `use` of `v` in `b` at index `i`. */
+    /** Holds if there is a variable access `use` of `v` in `b` at index `i`. */
     cached
     predicate variableSourceUse(SsaSourceVariable v, ControlFlowNode use, BasicBlock b, int i) {
       v.getASourceUse() = use and
diff --git a/python/ql/lib/semmle/python/filters/GeneratedCode.qll b/python/ql/lib/semmle/python/filters/GeneratedCode.qll
index 8785c755974..03dab3bef88 100644
--- a/python/ql/lib/semmle/python/filters/GeneratedCode.qll
+++ b/python/ql/lib/semmle/python/filters/GeneratedCode.qll
@@ -14,7 +14,7 @@ abstract class GeneratedFile extends File {
  * There is no formal reason for the above, it just seems to work well in practice.
  */
 
-library class GenericGeneratedFile extends GeneratedFile {
+class GenericGeneratedFile extends GeneratedFile {
   GenericGeneratedFile() {
     not this instanceof SpecificGeneratedFile and
     (
@@ -103,7 +103,7 @@ private predicate auto_generated(File f) {
 /**
  * A file generated by a template engine
  */
-abstract library class SpecificGeneratedFile extends GeneratedFile {
+abstract class SpecificGeneratedFile extends GeneratedFile {
   /*
    * Currently cover Spitfire, Pyxl and Mako.
    *  Django templates are not compiled to Python.
@@ -112,7 +112,7 @@ abstract library class SpecificGeneratedFile extends GeneratedFile {
 
   }
 
-/** File generated by the spitfire templating engine */
+/** A file generated by the spitfire templating engine */
 class SpitfireGeneratedFile extends SpecificGeneratedFile {
   SpitfireGeneratedFile() {
     exists(Module m | m.getFile() = this and not m instanceof SpitfireTemplate |
@@ -127,14 +127,14 @@ class SpitfireGeneratedFile extends SpecificGeneratedFile {
   override string getTool() { result = "spitfire" }
 }
 
-/** File generated by the pyxl templating engine */
+/** A file generated by the pyxl templating engine */
 class PyxlGeneratedFile extends SpecificGeneratedFile {
   PyxlGeneratedFile() { this.getSpecifiedEncoding() = "pyxl" }
 
   override string getTool() { result = "pyxl" }
 }
 
-/** File generated by the mako templating engine */
+/** A file generated by the mako templating engine */
 class MakoGeneratedFile extends SpecificGeneratedFile {
   MakoGeneratedFile() {
     exists(Module m | m.getFile() = this |
@@ -166,7 +166,7 @@ string from_mako_import(Module m) {
   )
 }
 
-/** File generated by Google's protobuf tool. */
+/** A file generated by Google's protobuf tool. */
 class ProtobufGeneratedFile extends SpecificGeneratedFile {
   ProtobufGeneratedFile() {
     this.getAbsolutePath().regexpMatch(".*_pb2?.py") and
diff --git a/python/ql/lib/semmle/python/filters/Tests.qll b/python/ql/lib/semmle/python/filters/Tests.qll
index b35f275aab5..53c4e1ba176 100644
--- a/python/ql/lib/semmle/python/filters/Tests.qll
+++ b/python/ql/lib/semmle/python/filters/Tests.qll
@@ -15,7 +15,7 @@ class UnitTestClass extends TestScope {
 
 abstract class Test extends TestScope { }
 
-/** Class of test function that uses the `unittest` framework */
+/** A test function that uses the `unittest` framework */
 class UnitTestFunction extends Test {
   UnitTestFunction() {
     this.getScope+() instanceof UnitTestClass and
@@ -37,7 +37,7 @@ class NoseTestFunction extends Test {
   }
 }
 
-/** Class of functions that are clearly tests, but don't belong to a specific framework */
+/** A function that is clearly a test, but doesn't belong to a specific framework */
 class UnknownTestFunction extends Test {
   UnknownTestFunction() {
     this.(Function).getName().matches("test%") and
diff --git a/python/ql/lib/semmle/python/frameworks/Aiohttp.qll b/python/ql/lib/semmle/python/frameworks/Aiohttp.qll
index 3ec70643986..8579e5039a9 100644
--- a/python/ql/lib/semmle/python/frameworks/Aiohttp.qll
+++ b/python/ql/lib/semmle/python/frameworks/Aiohttp.qll
@@ -639,3 +639,53 @@ module AiohttpWebModel {
     override DataFlow::Node getValueArg() { result = value }
   }
 }
+
+/**
+ * Provides models for the web server part (`aiohttp.client`) of the `aiohttp` PyPI package.
+ * See https://docs.aiohttp.org/en/stable/client.html
+ */
+private module AiohttpClientModel {
+  /**
+   * Provides models for the `aiohttp.ClientSession` class
+   *
+   * See https://docs.aiohttp.org/en/stable/client_reference.html#aiohttp.ClientSession.
+   */
+  module ClientSession {
+    /** Gets a reference to the `aiohttp.ClientSession` class. */
+    private API::Node classRef() {
+      result = API::moduleImport("aiohttp").getMember("ClientSession")
+    }
+
+    /** Gets a reference to an instance of `aiohttp.ClientSession`. */
+    private API::Node instance() { result = classRef().getReturn() }
+
+    /** A method call on a ClientSession that sends off a request */
+    private class OutgoingRequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+      string methodName;
+
+      OutgoingRequestCall() {
+        methodName in [HTTP::httpVerbLower(), "request"] and
+        this = instance().getMember(methodName).getACall()
+      }
+
+      override DataFlow::Node getAUrlPart() {
+        result = this.getArgByName("url")
+        or
+        not methodName = "request" and
+        result = this.getArg(0)
+        or
+        methodName = "request" and
+        result = this.getArg(1)
+      }
+
+      override string getFramework() { result = "aiohttp.ClientSession" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        // TODO: Look into disabling certificate validation
+        none()
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/Aiomysql.qll b/python/ql/lib/semmle/python/frameworks/Aiomysql.qll
index 62c68d1b869..ae856589528 100644
--- a/python/ql/lib/semmle/python/frameworks/Aiomysql.qll
+++ b/python/ql/lib/semmle/python/frameworks/Aiomysql.qll
@@ -15,7 +15,7 @@ private module Aiomysql {
   private import semmle.python.internal.Awaited
 
   /**
-   * A `ConectionPool` is created when the result of `aiomysql.create_pool()` is awaited.
+   * Gets a `ConnectionPool` that is created when the result of `aiomysql.create_pool()` is awaited.
    * See https://aiomysql.readthedocs.io/en/stable/pool.html
    */
   API::Node connectionPool() {
@@ -23,7 +23,7 @@ private module Aiomysql {
   }
 
   /**
-   * A `Connection` is created when
+   * Gets a `Connection` that is created when
    * - the result of `aiomysql.connect()` is awaited.
    * - the result of calling `aquire` on a `ConnectionPool` is awaited.
    * See https://aiomysql.readthedocs.io/en/stable/connection.html#connection
@@ -35,7 +35,7 @@ private module Aiomysql {
   }
 
   /**
-   * A `Cursor` is created when
+   * Gets a `Cursor` that is created when
    * - the result of calling `cursor` on a `ConnectionPool` is awaited.
    * - the result of calling `cursor` on a `Connection` is awaited.
    * See https://aiomysql.readthedocs.io/en/stable/cursors.html
@@ -47,7 +47,7 @@ private module Aiomysql {
   }
 
   /**
-   * Calling `execute` on a `Cursor` constructs a query.
+   * A query. Calling `execute` on a `Cursor` constructs a query.
    * See https://aiomysql.readthedocs.io/en/stable/cursors.html#Cursor.execute
    */
   class CursorExecuteCall extends SqlConstruction::Range, DataFlow::CallCfgNode {
@@ -73,7 +73,7 @@ private module Aiomysql {
   }
 
   /**
-   * Awaiting the result of calling `execute` executes the query.
+   * An awaited query. Awaiting the result of calling `execute` executes the query.
    * See https://aiomysql.readthedocs.io/en/stable/cursors.html#Cursor.execute
    */
   class AwaitedCursorExecuteCall extends SqlExecution::Range {
@@ -85,7 +85,7 @@ private module Aiomysql {
   }
 
   /**
-   * An `Engine` is created when the result of calling `aiomysql.sa.create_engine` is awaited.
+   * Gets an `Engine` that is created when the result of calling `aiomysql.sa.create_engine` is awaited.
    * See https://aiomysql.readthedocs.io/en/stable/sa.html#engine
    */
   API::Node engine() {
@@ -98,13 +98,13 @@ private module Aiomysql {
   }
 
   /**
-   * A `SAConnection` is created when the result of calling `aquire` on an `Engine` is awaited.
+   * Gets an `SAConnection` that is created when the result of calling `aquire` on an `Engine` is awaited.
    * See https://aiomysql.readthedocs.io/en/stable/sa.html#connection
    */
   API::Node saConnection() { result = engine().getMember("acquire").getReturn().getAwaited() }
 
   /**
-   * Calling `execute` on a `SAConnection` constructs a query.
+   * A query. Calling `execute` on a `SAConnection` constructs a query.
    * See https://aiomysql.readthedocs.io/en/stable/sa.html#aiomysql.sa.SAConnection.execute
    */
   class SAConnectionExecuteCall extends SqlConstruction::Range, DataFlow::CallCfgNode {
@@ -132,7 +132,7 @@ private module Aiomysql {
   }
 
   /**
-   * Awaiting the result of calling `execute` executes the query.
+   * An awaited query. Awaiting the result of calling `execute` executes the query.
    * See https://aiomysql.readthedocs.io/en/stable/sa.html#aiomysql.sa.SAConnection.execute
    */
   class AwaitedSAConnectionExecuteCall extends SqlExecution::Range {
diff --git a/python/ql/lib/semmle/python/frameworks/Aiopg.qll b/python/ql/lib/semmle/python/frameworks/Aiopg.qll
index 927ae90ed05..6d5937ed789 100644
--- a/python/ql/lib/semmle/python/frameworks/Aiopg.qll
+++ b/python/ql/lib/semmle/python/frameworks/Aiopg.qll
@@ -15,7 +15,7 @@ private module Aiopg {
   private import semmle.python.internal.Awaited
 
   /**
-   * A `ConectionPool` is created when the result of `aiopg.create_pool()` is awaited.
+   * Gets a `ConnectionPool` that is created when the result of `aiopg.create_pool()` is awaited.
    * See https://aiopg.readthedocs.io/en/stable/core.html#pool
    */
   API::Node connectionPool() {
@@ -23,7 +23,7 @@ private module Aiopg {
   }
 
   /**
-   * A `Connection` is created when
+   * Gets a `Connection` that is created when
    * - the result of `aiopg.connect()` is awaited.
    * - the result of calling `aquire` on a `ConnectionPool` is awaited.
    * See https://aiopg.readthedocs.io/en/stable/core.html#connection
@@ -35,7 +35,7 @@ private module Aiopg {
   }
 
   /**
-   * A `Cursor` is created when
+   * Gets a `Cursor` that is created when
    * - the result of calling `cursor` on a `ConnectionPool` is awaited.
    * - the result of calling `cursor` on a `Connection` is awaited.
    * See https://aiopg.readthedocs.io/en/stable/core.html#cursor
@@ -47,7 +47,7 @@ private module Aiopg {
   }
 
   /**
-   * Calling `execute` on a `Cursor` constructs a query.
+   * A query. Calling `execute` on a `Cursor` constructs a query.
    * See https://aiopg.readthedocs.io/en/stable/core.html#aiopg.Cursor.execute
    */
   class CursorExecuteCall extends SqlConstruction::Range, DataFlow::CallCfgNode {
@@ -73,7 +73,7 @@ private module Aiopg {
   }
 
   /**
-   * Awaiting the result of calling `execute` executes the query.
+   * An awaited query. Awaiting the result of calling `execute` executes the query.
    * See https://aiopg.readthedocs.io/en/stable/core.html#aiopg.Cursor.execute
    */
   class AwaitedCursorExecuteCall extends SqlExecution::Range {
@@ -85,7 +85,7 @@ private module Aiopg {
   }
 
   /**
-   * An `Engine` is created when the result of calling `aiopg.sa.create_engine` is awaited.
+   * Gets an `Engine` that is created when the result of calling `aiopg.sa.create_engine` is awaited.
    * See https://aiopg.readthedocs.io/en/stable/sa.html#engine
    */
   API::Node engine() {
@@ -94,13 +94,13 @@ private module Aiopg {
   }
 
   /**
-   * A `SAConnection` is created when the result of calling `aquire` on an `Engine` is awaited.
+   * Gets an `SAConnection` that is created when the result of calling `aquire` on an `Engine` is awaited.
    * See https://aiopg.readthedocs.io/en/stable/sa.html#connection
    */
   API::Node saConnection() { result = engine().getMember("acquire").getReturn().getAwaited() }
 
   /**
-   * Calling `execute` on a `SAConnection` constructs a query.
+   * A query. Calling `execute` on a `SAConnection` constructs a query.
    * See https://aiopg.readthedocs.io/en/stable/sa.html#aiopg.sa.SAConnection.execute
    */
   class SAConnectionExecuteCall extends SqlConstruction::Range, DataFlow::CallCfgNode {
@@ -128,7 +128,7 @@ private module Aiopg {
   }
 
   /**
-   * Awaiting the result of calling `execute` executes the query.
+   * An awaited query. Awaiting the result of calling `execute` executes the query.
    * See https://aiopg.readthedocs.io/en/stable/sa.html#aiopg.sa.SAConnection.execute
    */
   class AwaitedSAConnectionExecuteCall extends SqlExecution::Range {
diff --git a/python/ql/lib/semmle/python/frameworks/Asyncpg.qll b/python/ql/lib/semmle/python/frameworks/Asyncpg.qll
index 031342a4c23..51034d7d7f2 100644
--- a/python/ql/lib/semmle/python/frameworks/Asyncpg.qll
+++ b/python/ql/lib/semmle/python/frameworks/Asyncpg.qll
@@ -12,13 +12,13 @@ private import semmle.python.ApiGraphs
 private module Asyncpg {
   private import semmle.python.internal.Awaited
 
-  /** A `ConectionPool` is created when the result of `asyncpg.create_pool()` is awaited. */
+  /** Gets a `ConnectionPool` that is created when the result of `asyncpg.create_pool()` is awaited. */
   API::Node connectionPool() {
     result = API::moduleImport("asyncpg").getMember("create_pool").getReturn().getAwaited()
   }
 
   /**
-   * A `Connection` is created when
+   * Gets a `Connection` that is created when
    * - the result of `asyncpg.connect()` is awaited.
    * - the result of calling `aquire` on a `ConnectionPool` is awaited.
    */
@@ -46,7 +46,7 @@ private module Asyncpg {
     }
   }
 
-  /** `Connection`s and `ConnectionPool`s provide some methods that access the file system. */
+  /** A model of `Connection` and `ConnectionPool`, which provide some methods that access the file system. */
   class FileAccessOnConnection extends FileSystemAccess::Range, DataFlow::MethodCallNode {
     string methodName;
 
diff --git a/python/ql/lib/semmle/python/frameworks/ClickhouseDriver.qll b/python/ql/lib/semmle/python/frameworks/ClickhouseDriver.qll
index 949f4d5e870..c46e8d060a9 100644
--- a/python/ql/lib/semmle/python/frameworks/ClickhouseDriver.qll
+++ b/python/ql/lib/semmle/python/frameworks/ClickhouseDriver.qll
@@ -20,7 +20,7 @@ private import semmle.python.frameworks.PEP249
  */
 module ClickhouseDriver {
   /**
-   * `clickhouse_driver` implements PEP249,
+   * A model of `clickhouse-driver`, which implements PEP249,
    * providing ways to execute SQL statements against a database.
    */
   class ClickHouseDriverPEP249 extends PEP249::PEP249ModuleApiNode {
diff --git a/python/ql/lib/semmle/python/frameworks/Django.qll b/python/ql/lib/semmle/python/frameworks/Django.qll
index 8f34043f093..558d90353d6 100644
--- a/python/ql/lib/semmle/python/frameworks/Django.qll
+++ b/python/ql/lib/semmle/python/frameworks/Django.qll
@@ -526,8 +526,11 @@ module PrivateDjango {
   /** Gets a reference to the `django` module. */
   API::Node django() { result = API::moduleImport("django") }
 
+  /** DEPRECATED: Alias for `DjangoImpl` */
+  deprecated module django = DjangoImpl;
+
   /** Provides models for the `django` module. */
-  module django {
+  module DjangoImpl {
     // -------------------------------------------------------------------------
     // django.db
     // -------------------------------------------------------------------------
@@ -541,8 +544,11 @@ module PrivateDjango {
       DjangoDb() { this = API::moduleImport("django").getMember("db") }
     }
 
+    /** DEPRECATED: Alias for `DB` */
+    deprecated module db = DB;
+
     /** Provides models for the `django.db` module. */
-    module db {
+    module DB {
       /** Gets a reference to the `django.db.connection` object. */
       API::Node connection() { result = db().getMember("connection") }
 
@@ -557,8 +563,11 @@ module PrivateDjango {
       /** Gets a reference to the `django.db.models` module. */
       API::Node models() { result = db().getMember("models") }
 
+      /** DEPRECATED: Alias for `Models` */
+      deprecated module models = Models;
+
       /** Provides models for the `django.db.models` module. */
-      module models {
+      module Models {
         /**
          * Provides models for the `django.db.models.Model` class and subclasses.
          *
@@ -608,10 +617,13 @@ module PrivateDjango {
         /** Gets a reference to the `django.db.models.expressions` module. */
         API::Node expressions() { result = models().getMember("expressions") }
 
+        /** DEPRECATED: Alias for `Expressions` */
+        deprecated module expressions = Expressions;
+
         /** Provides models for the `django.db.models.expressions` module. */
-        module expressions {
-          /** Provides models for the `django.db.models.expressions.RawSQL` class. */
-          module RawSQL {
+        module Expressions {
+          /** Provides models for the `django.db.models.expressions.RawSql` class. */
+          module RawSql {
             /**
              * Gets an reference to the `django.db.models.expressions.RawSQL` class.
              */
@@ -644,6 +656,9 @@ module PrivateDjango {
               instance(DataFlow::TypeTracker::end(), sql).flowsTo(result)
             }
           }
+
+          /** DEPRECATED: Alias for RawSql */
+          deprecated module RawSQL = RawSql;
         }
       }
     }
@@ -659,8 +674,8 @@ module PrivateDjango {
       DataFlow::Node sql;
 
       ObjectsAnnotate() {
-        this = django::db::models::querySetReturningMethod("annotate").getACall() and
-        django::db::models::expressions::RawSQL::instance(sql) in [
+        this = DjangoImpl::DB::Models::querySetReturningMethod("annotate").getACall() and
+        DjangoImpl::DB::Models::Expressions::RawSql::instance(sql) in [
             this.getArg(_), this.getArgByName(_)
           ]
       }
@@ -677,8 +692,8 @@ module PrivateDjango {
       DataFlow::Node sql;
 
       ObjectsAlias() {
-        this = django::db::models::querySetReturningMethod("alias").getACall() and
-        django::db::models::expressions::RawSQL::instance(sql) in [
+        this = DjangoImpl::DB::Models::querySetReturningMethod("alias").getACall() and
+        DjangoImpl::DB::Models::Expressions::RawSql::instance(sql) in [
             this.getArg(_), this.getArgByName(_)
           ]
       }
@@ -694,7 +709,7 @@ module PrivateDjango {
      * - https://docs.djangoproject.com/en/3.1/ref/models/querysets/#raw
      */
     private class ObjectsRaw extends SqlExecution::Range, DataFlow::CallCfgNode {
-      ObjectsRaw() { this = django::db::models::querySetReturningMethod("raw").getACall() }
+      ObjectsRaw() { this = DjangoImpl::DB::Models::querySetReturningMethod("raw").getACall() }
 
       override DataFlow::Node getSql() { result = this.getArg(0) }
     }
@@ -705,7 +720,7 @@ module PrivateDjango {
      * See https://docs.djangoproject.com/en/3.1/ref/models/querysets/#extra
      */
     private class ObjectsExtra extends SqlExecution::Range, DataFlow::CallCfgNode {
-      ObjectsExtra() { this = django::db::models::querySetReturningMethod("extra").getACall() }
+      ObjectsExtra() { this = DjangoImpl::DB::Models::querySetReturningMethod("extra").getACall() }
 
       override DataFlow::Node getSql() {
         result in [
@@ -720,8 +735,11 @@ module PrivateDjango {
     /** Gets a reference to the `django.urls` module. */
     API::Node urls() { result = django().getMember("urls") }
 
+    /** DEPRECATED: Alias for `Urls` */
+    deprecated module urls = Urls;
+
     /** Provides models for the `django.urls` module */
-    module urls {
+    module Urls {
       /**
        * Gets a reference to the `django.urls.path` function.
        * See https://docs.djangoproject.com/en/3.0/ref/urls/#path
@@ -741,10 +759,16 @@ module PrivateDjango {
     /** Gets a reference to the `django.conf` module. */
     API::Node conf() { result = django().getMember("conf") }
 
+    /** DEPRECATED: Alias for `Conf` */
+    deprecated module conf = Conf;
+
     /** Provides models for the `django.conf` module */
-    module conf {
+    module Conf {
+      /** DEPRECATED: Alias for `ConfUrls` */
+      deprecated module conf_urls = ConfUrls;
+
       /** Provides models for the `django.conf.urls` module */
-      module conf_urls {
+      module ConfUrls {
         // -------------------------------------------------------------------------
         // django.conf.urls
         // -------------------------------------------------------------------------
@@ -767,16 +791,22 @@ module PrivateDjango {
     /** Gets a reference to the `django.http` module. */
     API::Node http() { result = django().getMember("http") }
 
+    /** DEPRECATED: Alias for `Http` */
+    deprecated module http = Http;
+
     /** Provides models for the `django.http` module */
-    module http {
+    module Http {
       // ---------------------------------------------------------------------------
       // django.http.request
       // ---------------------------------------------------------------------------
       /** Gets a reference to the `django.http.request` module. */
       API::Node request() { result = http().getMember("request") }
 
+      /** DEPRECATED: Alias for `Request` */
+      deprecated module request = Request;
+
       /** Provides models for the `django.http.request` module. */
-      module request {
+      module Request {
         /**
          * Provides models for the `django.http.request.HttpRequest` class
          *
@@ -857,7 +887,7 @@ module PrivateDjango {
               // special handling of the `build_absolute_uri` method, see
               // https://docs.djangoproject.com/en/3.0/ref/request-response/#django.http.HttpRequest.build_absolute_uri
               exists(DataFlow::AttrRead attr, DataFlow::CallCfgNode call, DataFlow::Node instance |
-                instance = django::http::request::HttpRequest::instance() and
+                instance = DjangoImpl::Http::Request::HttpRequest::instance() and
                 attr.getObject() = instance
               |
                 attr.getAttributeName() = "build_absolute_uri" and
@@ -934,8 +964,11 @@ module PrivateDjango {
       /** Gets a reference to the `django.http.response` module. */
       API::Node response() { result = http().getMember("response") }
 
+      /** DEPRECATED: Alias for `Response` */
+      deprecated module response = Response;
+
       /** Provides models for the `django.http.response` module */
-      module response {
+      module Response {
         /**
          * Provides models for the `django.http.response.HttpResponse` class
          *
@@ -1669,17 +1702,17 @@ module PrivateDjango {
 
         /** Gets a reference to the `django.http.response.HttpResponse.write` function. */
         private DataFlow::TypeTrackingNode write(
-          django::http::response::HttpResponse::InstanceSource instance, DataFlow::TypeTracker t
+          DjangoImpl::Http::Response::HttpResponse::InstanceSource instance, DataFlow::TypeTracker t
         ) {
           t.startInAttr("write") and
-          instance = django::http::response::HttpResponse::instance() and
+          instance = DjangoImpl::Http::Response::HttpResponse::instance() and
           result = instance
           or
           exists(DataFlow::TypeTracker t2 | result = write(instance, t2).track(t2, t))
         }
 
         /** Gets a reference to the `django.http.response.HttpResponse.write` function. */
-        DataFlow::Node write(django::http::response::HttpResponse::InstanceSource instance) {
+        DataFlow::Node write(DjangoImpl::Http::Response::HttpResponse::InstanceSource instance) {
           write(instance, DataFlow::TypeTracker::end()).flowsTo(result)
         }
 
@@ -1689,7 +1722,7 @@ module PrivateDjango {
          * See https://docs.djangoproject.com/en/3.1/ref/request-response/#django.http.HttpResponse.write
          */
         class HttpResponseWriteCall extends HTTP::Server::HttpResponse::Range, DataFlow::CallCfgNode {
-          django::http::response::HttpResponse::InstanceSource instance;
+          DjangoImpl::Http::Response::HttpResponse::InstanceSource instance;
 
           HttpResponseWriteCall() { this.getFunction() = write(instance) }
 
@@ -1710,7 +1743,7 @@ module PrivateDjango {
         class DjangoResponseSetCookieCall extends HTTP::Server::CookieWrite::Range,
           DataFlow::MethodCallNode {
           DjangoResponseSetCookieCall() {
-            this.calls(django::http::response::HttpResponse::instance(), "set_cookie")
+            this.calls(DjangoImpl::Http::Response::HttpResponse::instance(), "set_cookie")
           }
 
           override DataFlow::Node getHeaderArg() { none() }
@@ -1730,7 +1763,7 @@ module PrivateDjango {
         class DjangoResponseDeleteCookieCall extends HTTP::Server::CookieWrite::Range,
           DataFlow::MethodCallNode {
           DjangoResponseDeleteCookieCall() {
-            this.calls(django::http::response::HttpResponse::instance(), "delete_cookie")
+            this.calls(DjangoImpl::Http::Response::HttpResponse::instance(), "delete_cookie")
           }
 
           override DataFlow::Node getHeaderArg() { none() }
@@ -1757,7 +1790,7 @@ module PrivateDjango {
               this.asCfgNode() = subscript
             |
               cookieLookup.getAttributeName() = "cookies" and
-              cookieLookup.getObject() = django::http::response::HttpResponse::instance() and
+              cookieLookup.getObject() = DjangoImpl::Http::Response::HttpResponse::instance() and
               exists(DataFlow::Node subscriptObj |
                 subscriptObj.asCfgNode() = subscript.getObject()
               |
@@ -1783,8 +1816,11 @@ module PrivateDjango {
     /** Gets a reference to the `django.shortcuts` module. */
     API::Node shortcuts() { result = django().getMember("shortcuts") }
 
+    /** DEPRECATED: Alias for `Shortcuts` */
+    deprecated module shortcuts = Shortcuts;
+
     /** Provides models for the `django.shortcuts` module */
-    module shortcuts {
+    module Shortcuts {
       /**
        * Gets a reference to the `django.shortcuts.redirect` function
        *
@@ -1862,7 +1898,8 @@ module PrivateDjango {
   // routing modeling
   // ---------------------------------------------------------------------------
   /**
-   * In order to recognize a class as being a django view class, based on the `as_view`
+   * A class that may be a django view class. In order to recognize a class as being a django view class,
+   * based on the `as_view`
    * call, we need to be able to track such calls on _any_ class. This is provided by
    * the member predicates of this QL class.
    *
@@ -1873,7 +1910,7 @@ module PrivateDjango {
     /** Gets a reference to this class. */
     private DataFlow::TypeTrackingNode getARef(DataFlow::TypeTracker t) {
       t.start() and
-      result.asExpr().(ClassExpr) = this.getParent()
+      result.asExpr() = this.getParent()
       or
       exists(DataFlow::TypeTracker t2 | result = this.getARef(t2).track(t2, t))
     }
@@ -1973,7 +2010,7 @@ module PrivateDjango {
   /** Provides a class for modeling new django route handlers. */
   module DjangoRouteHandler {
     /**
-     * Extend this class to model new APIs. If you want to refine existing API models,
+     * A django route handler. Extend this class to model new APIs. If you want to refine existing API models,
      * extend `DjangoRouteHandler` instead.
      */
     abstract class Range extends Function { }
@@ -2059,7 +2096,7 @@ module PrivateDjango {
    * See https://docs.djangoproject.com/en/3.0/ref/urls/#path
    */
   private class DjangoUrlsPathCall extends DjangoRouteSetup, DataFlow::CallCfgNode {
-    DjangoUrlsPathCall() { this = django::urls::path().getACall() }
+    DjangoUrlsPathCall() { this = DjangoImpl::Urls::path().getACall() }
 
     override DataFlow::Node getUrlPatternArg() {
       result in [this.getArg(0), this.getArgByName("route")]
@@ -2142,7 +2179,7 @@ module PrivateDjango {
    */
   private class DjangoUrlsRePathCall extends DjangoRegexRouteSetup, DataFlow::CallCfgNode {
     DjangoUrlsRePathCall() {
-      this = django::urls::re_path().getACall() and
+      this = DjangoImpl::Urls::re_path().getACall() and
       // `django.conf.urls.url` (which we support directly with
       // `DjangoConfUrlsUrlCall`), is implemented in Django 2+ as backward compatibility
       // using `django.urls.re_path`. See
@@ -2172,7 +2209,7 @@ module PrivateDjango {
    * See https://docs.djangoproject.com/en/1.11/ref/urls/#django.conf.urls.url
    */
   private class DjangoConfUrlsUrlCall extends DjangoRegexRouteSetup, DataFlow::CallCfgNode {
-    DjangoConfUrlsUrlCall() { this = django::conf::conf_urls::url().getACall() }
+    DjangoConfUrlsUrlCall() { this = DjangoImpl::Conf::ConfUrls::url().getACall() }
 
     override DataFlow::Node getUrlPatternArg() {
       result in [this.getArg(0), this.getArgByName("regex")]
@@ -2185,7 +2222,7 @@ module PrivateDjango {
   // HttpRequest taint modeling
   // ---------------------------------------------------------------------------
   /** A parameter that will receive the django `HttpRequest` instance when a request handler is invoked. */
-  private class DjangoRequestHandlerRequestParam extends django::http::request::HttpRequest::InstanceSource,
+  private class DjangoRequestHandlerRequestParam extends DjangoImpl::Http::Request::HttpRequest::InstanceSource,
     RemoteFlowSource::Range, DataFlow::ParameterNode {
     DjangoRequestHandlerRequestParam() {
       this.getParameter() = any(DjangoRouteSetup setup).getARequestHandler().getRequestParam()
@@ -2202,7 +2239,7 @@ module PrivateDjango {
    *
    * See https://docs.djangoproject.com/en/3.1/topics/class-based-views/generic-display/#dynamic-filtering
    */
-  private class DjangoViewClassRequestAttributeRead extends django::http::request::HttpRequest::InstanceSource,
+  private class DjangoViewClassRequestAttributeRead extends DjangoImpl::Http::Request::HttpRequest::InstanceSource,
     RemoteFlowSource::Range, DataFlow::Node {
     DjangoViewClassRequestAttributeRead() {
       exists(DataFlow::AttrRead read | this = read |
@@ -2249,7 +2286,7 @@ module PrivateDjango {
    */
   private class DjangoShortcutsRedirectCall extends HTTP::Server::HttpRedirectResponse::Range,
     DataFlow::CallCfgNode {
-    DjangoShortcutsRedirectCall() { this = django::shortcuts::redirect().getACall() }
+    DjangoShortcutsRedirectCall() { this = DjangoImpl::Shortcuts::redirect().getACall() }
 
     /**
      * Gets the data-flow node that specifies the location of this HTTP redirect response.
diff --git a/python/ql/lib/semmle/python/frameworks/Fabric.qll b/python/ql/lib/semmle/python/frameworks/Fabric.qll
index c23d3fdb82e..bb1500965f4 100644
--- a/python/ql/lib/semmle/python/frameworks/Fabric.qll
+++ b/python/ql/lib/semmle/python/frameworks/Fabric.qll
@@ -24,7 +24,7 @@ private module FabricV1 {
   API::Node fabric() { result = API::moduleImport("fabric") }
 
   /** Provides models for the `fabric` module. */
-  module fabric {
+  module Fabric {
     // -------------------------------------------------------------------------
     // fabric.api
     // -------------------------------------------------------------------------
@@ -32,7 +32,7 @@ private module FabricV1 {
     API::Node api() { result = fabric().getMember("api") }
 
     /** Provides models for the `fabric.api` module */
-    module api {
+    module Api {
       /**
        * A call to either
        * - `fabric.api.local`
@@ -66,7 +66,7 @@ private module FabricV2 {
   API::Node fabric() { result = API::moduleImport("fabric") }
 
   /** Provides models for the `fabric` module. */
-  module fabric {
+  module Fabric {
     // -------------------------------------------------------------------------
     // fabric.connection
     // -------------------------------------------------------------------------
@@ -74,13 +74,13 @@ private module FabricV2 {
     API::Node connection() { result = fabric().getMember("connection") }
 
     /** Provides models for the `fabric.connection` module */
-    module connection {
+    module Connection {
       /**
        * Provides models for the `fabric.connection.Connection` class
        *
        * See https://docs.fabfile.org/en/2.5/api/connection.html#fabric.connection.Connection.
        */
-      module Connection {
+      module ConnectionClass {
         /** Gets a reference to the `fabric.connection.Connection` class. */
         API::Node classRef() {
           result = fabric().getMember("Connection")
@@ -155,7 +155,7 @@ private module FabricV2 {
     private class FabricConnectionRunSudoLocalCall extends SystemCommandExecution::Range,
       DataFlow::CallCfgNode {
       FabricConnectionRunSudoLocalCall() {
-        this.getFunction() = fabric::connection::Connection::instanceRunMethods()
+        this.getFunction() = Fabric::Connection::ConnectionClass::instanceRunMethods()
       }
 
       override DataFlow::Node getCommand() {
@@ -170,16 +170,16 @@ private module FabricV2 {
     API::Node tasks() { result = fabric().getMember("tasks") }
 
     /** Provides models for the `fabric.tasks` module */
-    module tasks {
+    module Tasks {
       /** Gets a reference to the `fabric.tasks.task` decorator. */
       API::Node task() { result in [tasks().getMember("task"), fabric().getMember("task")] }
     }
 
-    class FabricTaskFirstParamConnectionInstance extends fabric::connection::Connection::InstanceSource,
+    class FabricTaskFirstParamConnectionInstance extends Fabric::Connection::ConnectionClass::InstanceSource,
       DataFlow::ParameterNode {
       FabricTaskFirstParamConnectionInstance() {
         exists(Function func |
-          func.getADecorator() = fabric::tasks::task().getAUse().asExpr() and
+          func.getADecorator() = Fabric::Tasks::task().getAUse().asExpr() and
           this.getParameter() = func.getArg(0)
         )
       }
@@ -192,7 +192,7 @@ private module FabricV2 {
     API::Node group() { result = fabric().getMember("group") }
 
     /** Provides models for the `fabric.group` module */
-    module group {
+    module Group {
       /**
        * Provides models for the `fabric.group.Group` class and its subclasses.
        *
@@ -204,7 +204,7 @@ private module FabricV2 {
        * - https://docs.fabfile.org/en/2.5/api/group.html#fabric.group.SerialGroup
        * - https://docs.fabfile.org/en/2.5/api/group.html#fabric.group.ThreadingGroup
        */
-      module Group {
+      module GroupClass {
         /**
          * A source of instances of a subclass of `fabric.group, extend this class to model new instances.Group`
          *
@@ -236,7 +236,9 @@ private module FabricV2 {
        * See https://docs.fabfile.org/en/2.5/api/group.html#fabric.group.Group.run
        */
       private class FabricGroupRunCall extends SystemCommandExecution::Range, DataFlow::CallCfgNode {
-        FabricGroupRunCall() { this = fabric::group::Group::subclassInstanceRunMethod().getACall() }
+        FabricGroupRunCall() {
+          this = Fabric::Group::GroupClass::subclassInstanceRunMethod().getACall()
+        }
 
         override DataFlow::Node getCommand() {
           result = [this.getArg(0), this.getArgByName("command")]
@@ -249,7 +251,7 @@ private module FabricV2 {
        * See https://docs.fabfile.org/en/2.5/api/group.html#fabric.group.SerialGroup.
        */
       module SerialGroup {
-        private class ClassInstantiation extends Group::ModeledSubclass {
+        private class ClassInstantiation extends GroupClass::ModeledSubclass {
           ClassInstantiation() {
             this = group().getMember("SerialGroup")
             or
@@ -264,7 +266,7 @@ private module FabricV2 {
        * See https://docs.fabfile.org/en/2.5/api/group.html#fabric.group.ThreadingGroup.
        */
       module ThreadingGroup {
-        private class ClassInstantiation extends Group::ModeledSubclass {
+        private class ClassInstantiation extends GroupClass::ModeledSubclass {
           ClassInstantiation() {
             this = group().getMember("ThreadingGroup")
             or
diff --git a/python/ql/lib/semmle/python/frameworks/FastApi.qll b/python/ql/lib/semmle/python/frameworks/FastApi.qll
index d8e0f1f0883..1c48562eb70 100644
--- a/python/ql/lib/semmle/python/frameworks/FastApi.qll
+++ b/python/ql/lib/semmle/python/frameworks/FastApi.qll
@@ -30,13 +30,16 @@ private module FastApi {
    *
    * See https://fastapi.tiangolo.com/tutorial/bigger-applications/.
    */
-  module APIRouter {
-    /** Gets a reference to an instance of `fastapi.APIRouter`. */
+  module ApiRouter {
+    /** Gets a reference to an instance of `fastapi.ApiRouter`. */
     API::Node instance() {
       result = API::moduleImport("fastapi").getMember("APIRouter").getASubclass*().getReturn()
     }
   }
 
+  /** DEPRECATED: Alias for ApiRouter */
+  deprecated module APIRouter = ApiRouter;
+
   // ---------------------------------------------------------------------------
   // routing modeling
   // ---------------------------------------------------------------------------
@@ -54,7 +57,7 @@ private module FastApi {
       |
         this = App::instance().getMember(routeAddingMethod).getACall()
         or
-        this = APIRouter::instance().getMember(routeAddingMethod).getACall()
+        this = ApiRouter::instance().getMember(routeAddingMethod).getACall()
       )
     }
 
diff --git a/python/ql/lib/semmle/python/frameworks/Flask.qll b/python/ql/lib/semmle/python/frameworks/Flask.qll
index 7f54761d911..9b79e74d31e 100644
--- a/python/ql/lib/semmle/python/frameworks/Flask.qll
+++ b/python/ql/lib/semmle/python/frameworks/Flask.qll
@@ -193,7 +193,7 @@ module Flask {
 
     FlaskViewClass() {
       this.getABase() = Views::View::subclassRef().getAUse().asExpr() and
-      api_node.getAnImmediateUse().asExpr().(ClassExpr) = this.getParent()
+      api_node.getAnImmediateUse().asExpr() = this.getParent()
     }
 
     /** Gets a function that could handle incoming requests, if any. */
@@ -218,7 +218,7 @@ module Flask {
   class FlaskMethodViewClass extends FlaskViewClass {
     FlaskMethodViewClass() {
       this.getABase() = Views::MethodView::subclassRef().getAUse().asExpr() and
-      api_node.getAnImmediateUse().asExpr().(ClassExpr) = this.getParent()
+      api_node.getAnImmediateUse().asExpr() = this.getParent()
     }
 
     override Function getARequestHandler() {
@@ -299,7 +299,7 @@ module Flask {
     override Function getARequestHandler() {
       exists(DataFlow::LocalSourceNode func_src |
         func_src.flowsTo(this.getViewArg()) and
-        func_src.asExpr().(CallableExpr) = result.getDefinition()
+        func_src.asExpr() = result.getDefinition()
       )
       or
       exists(FlaskViewClass vc |
diff --git a/python/ql/lib/semmle/python/frameworks/Httpx.qll b/python/ql/lib/semmle/python/frameworks/Httpx.qll
new file mode 100644
index 00000000000..315791f5b8a
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Httpx.qll
@@ -0,0 +1,88 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `httpx` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/httpx/
+ * - https://www.python-httpx.org/
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `httpx` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/httpx/
+ * - https://www.python-httpx.org/
+ */
+private module HttpxModel {
+  private class RequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+    string methodName;
+
+    RequestCall() {
+      methodName in [HTTP::httpVerbLower(), "request", "stream"] and
+      this = API::moduleImport("httpx").getMember(methodName).getACall()
+    }
+
+    override DataFlow::Node getAUrlPart() {
+      result = this.getArgByName("url")
+      or
+      if methodName in ["request", "stream"]
+      then result = this.getArg(1)
+      else result = this.getArg(0)
+    }
+
+    override string getFramework() { result = "httpx" }
+
+    override predicate disablesCertificateValidation(
+      DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+    ) {
+      // TODO: Look into disabling certificate validation
+      none()
+    }
+  }
+
+  /**
+   * Provides models for the `httpx.[Async]Client` class
+   *
+   * See https://www.python-httpx.org/async/
+   */
+  module Client {
+    /** Get a reference to the `httpx.Client` or `httpx.AsyncClient` class. */
+    private API::Node classRef() {
+      result = API::moduleImport("httpx").getMember(["Client", "AsyncClient"])
+    }
+
+    /** Get a reference to an `httpx.Client` or `httpx.AsyncClient` instance. */
+    private API::Node instance() { result = classRef().getReturn() }
+
+    /** A method call on a Client that sends off a request */
+    private class OutgoingRequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+      string methodName;
+
+      OutgoingRequestCall() {
+        methodName in [HTTP::httpVerbLower(), "request", "stream"] and
+        this = instance().getMember(methodName).getACall()
+      }
+
+      override DataFlow::Node getAUrlPart() {
+        result = this.getArgByName("url")
+        or
+        if methodName in ["request", "stream"]
+        then result = this.getArg(1)
+        else result = this.getArg(0)
+      }
+
+      override string getFramework() { result = "httpx.[Async]Client" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        // TODO: Look into disabling certificate validation
+        none()
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/Invoke.qll b/python/ql/lib/semmle/python/frameworks/Invoke.qll
index 6cef9586053..435536dda9f 100644
--- a/python/ql/lib/semmle/python/frameworks/Invoke.qll
+++ b/python/ql/lib/semmle/python/frameworks/Invoke.qll
@@ -20,14 +20,11 @@ private module Invoke {
   API::Node invoke() { result = API::moduleImport("invoke") }
 
   /** Provides models for the `invoke` module. */
-  module invoke {
-    /** Gets a reference to the `invoke.context` module. */
-    API::Node context() { result = invoke().getMember("context") }
-
+  module InvokeModule {
     /** Provides models for the `invoke.context` module */
-    module context {
+    module Context {
       /** Provides models for the `invoke.context.Context` class */
-      module Context {
+      module ContextClass {
         /** Gets a reference to the `invoke.context.Context` class. */
         API::Node classRef() {
           result = API::moduleImport("invoke").getMember("context").getMember("Context")
@@ -39,7 +36,7 @@ private module Invoke {
         private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
           t.start() and
           (
-            result = invoke::context::Context::classRef().getACall()
+            result = InvokeModule::Context::ContextClass::classRef().getACall()
             or
             exists(Function func |
               func.getADecorator() = invoke().getMember("task").getAUse().asExpr() and
@@ -56,7 +53,7 @@ private module Invoke {
         /** Gets a reference to the `run` or `sudo` methods on a `invoke.context.Context` instance. */
         private DataFlow::TypeTrackingNode instanceRunMethods(DataFlow::TypeTracker t) {
           t.startInAttr(["run", "sudo"]) and
-          result = invoke::context::Context::instance()
+          result = InvokeModule::Context::ContextClass::instance()
           or
           exists(DataFlow::TypeTracker t2 | result = instanceRunMethods(t2).track(t2, t))
         }
@@ -77,7 +74,7 @@ private module Invoke {
   private class InvokeRunCommandCall extends SystemCommandExecution::Range, DataFlow::CallCfgNode {
     InvokeRunCommandCall() {
       this = invoke().getMember(["run", "sudo"]).getACall() or
-      this.getFunction() = invoke::context::Context::instanceRunMethods()
+      this.getFunction() = InvokeModule::Context::ContextClass::instanceRunMethods()
     }
 
     override DataFlow::Node getCommand() {
diff --git a/python/ql/lib/semmle/python/frameworks/Libtaxii.qll b/python/ql/lib/semmle/python/frameworks/Libtaxii.qll
new file mode 100644
index 00000000000..44298b7c08f
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Libtaxii.qll
@@ -0,0 +1,42 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `libtaxii` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/libtaxii/
+ * - https://github.com/TAXIIProject/libtaxii
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `libtaxii` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/libtaxii/
+ * - https://github.com/TAXIIProject/libtaxii
+ */
+private module Libtaxii {
+  /**
+   * A call to `libtaxii.common.parse`.
+   * When the `allow_url` parameter value is set to `True`, there is an SSRF vulnerability..
+   */
+  private class ParseCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+    ParseCall() {
+      this = API::moduleImport("libtaxii").getMember("common").getMember("parse").getACall() and
+      this.getArgByName("allow_url").getALocalSource().asExpr() = any(True t)
+    }
+
+    override DataFlow::Node getAUrlPart() { result in [this.getArg(0), this.getArgByName("s")] }
+
+    override string getFramework() { result = "libtaxii.common.parse" }
+
+    override predicate disablesCertificateValidation(
+      DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+    ) {
+      // TODO: Look into disabling certificate validation
+      none()
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/MySQLdb.qll b/python/ql/lib/semmle/python/frameworks/MySQLdb.qll
index 871e8ee6b29..ecf78b7a514 100644
--- a/python/ql/lib/semmle/python/frameworks/MySQLdb.qll
+++ b/python/ql/lib/semmle/python/frameworks/MySQLdb.qll
@@ -27,7 +27,10 @@ private module MySQLdb {
   // ---------------------------------------------------------------------------
   // MySQLdb
   // ---------------------------------------------------------------------------
-  /** MySQLdb implements PEP 249, providing ways to execute SQL statements against a database. */
+  /**
+   * A model for MySQLdb as a module that implements PEP 249, providing ways to execute SQL statements
+   * against a database.
+   */
   class MySQLdb extends PEP249::PEP249ModuleApiNode {
     MySQLdb() { this = API::moduleImport("MySQLdb") }
   }
diff --git a/python/ql/lib/semmle/python/frameworks/Mysql.qll b/python/ql/lib/semmle/python/frameworks/Mysql.qll
index a1a297e88c0..b61037ff62a 100644
--- a/python/ql/lib/semmle/python/frameworks/Mysql.qll
+++ b/python/ql/lib/semmle/python/frameworks/Mysql.qll
@@ -25,7 +25,7 @@ private module Mysql {
   // mysql
   // ---------------------------------------------------------------------------
   /** Provides models for the `mysql` module. */
-  module mysql {
+  module MysqlMod {
     /**
      * The mysql.connector module
      * See https://dev.mysql.com/doc/connector-python/en/connector-python-example-connecting.html
diff --git a/python/ql/lib/semmle/python/frameworks/Psycopg2.qll b/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
index 01f33b37cd0..74016ebd639 100644
--- a/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
+++ b/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
@@ -22,7 +22,10 @@ private module Psycopg2 {
   // ---------------------------------------------------------------------------
   // Psycopg
   // ---------------------------------------------------------------------------
-  /** psycopg2 implements PEP 249, providing ways to execute SQL statements against a database. */
+  /**
+   * A model of psycopg2 as a module that implements PEP 249, providing ways to execute SQL statements
+   * against a database.
+   */
   class Psycopg2 extends PEP249::PEP249ModuleApiNode {
     Psycopg2() { this = API::moduleImport("psycopg2") }
   }
diff --git a/python/ql/lib/semmle/python/frameworks/PyMySQL.qll b/python/ql/lib/semmle/python/frameworks/PyMySQL.qll
index 834dd2438dc..0dfc5a92f38 100644
--- a/python/ql/lib/semmle/python/frameworks/PyMySQL.qll
+++ b/python/ql/lib/semmle/python/frameworks/PyMySQL.qll
@@ -14,8 +14,11 @@ private import semmle.python.frameworks.PEP249
  * Provides models for the `PyMySQL` PyPI package.
  * See https://pypi.org/project/PyMySQL/
  */
-private module PyMySQL {
-  /** PyMySQL implements PEP 249, providing ways to execute SQL statements against a database. */
+private module PyMySql {
+  /**
+   * A model of PyMySQL as a module that implements PEP 249, providing ways to execute SQL statements
+   * against a database.
+   */
   class PyMySQLPEP249 extends PEP249::PEP249ModuleApiNode {
     PyMySQLPEP249() { this = API::moduleImport("pymysql") }
   }
diff --git a/python/ql/lib/semmle/python/frameworks/Pycurl.qll b/python/ql/lib/semmle/python/frameworks/Pycurl.qll
new file mode 100644
index 00000000000..6a5fbcbcfeb
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Pycurl.qll
@@ -0,0 +1,59 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `pycurl` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/pycurl/
+ * - https://pycurl.io/docs/latest/
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `pycurl` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/pycurl/
+ * - https://pycurl.io/docs/latest/
+ */
+private module Pycurl {
+  /**
+   * Provides models for the `pycurl.Curl` class
+   *
+   * See https://pycurl.io/docs/latest/curl.html.
+   */
+  module Curl {
+    /** Gets a reference to the `pycurl.Curl` class. */
+    private API::Node classRef() { result = API::moduleImport("pycurl").getMember("Curl") }
+
+    /** Gets a reference to an instance of `pycurl.Curl`. */
+    private API::Node instance() { result = classRef().getReturn() }
+
+    /**
+     * When the first parameter value of the `setopt` function is set to `pycurl.URL`,
+     * the second parameter value is the request resource link.
+     *
+     * See http://pycurl.io/docs/latest/curlobject.html#pycurl.Curl.setopt.
+     */
+    private class OutgoingRequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+      OutgoingRequestCall() {
+        this = instance().getMember("setopt").getACall() and
+        this.getArg(0).asCfgNode().(AttrNode).getName() = "URL"
+      }
+
+      override DataFlow::Node getAUrlPart() {
+        result in [this.getArg(1), this.getArgByName("value")]
+      }
+
+      override string getFramework() { result = "pycurl.Curl" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        // TODO: Look into disabling certificate validation
+        none()
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/RestFramework.qll b/python/ql/lib/semmle/python/frameworks/RestFramework.qll
index a6373df7120..0f6f64e92c7 100644
--- a/python/ql/lib/semmle/python/frameworks/RestFramework.qll
+++ b/python/ql/lib/semmle/python/frameworks/RestFramework.qll
@@ -220,7 +220,7 @@ private module RestFramework {
      *
      * Use the predicate `Request::instance()` to get references to instances of `rest_framework.request.Request`.
      */
-    abstract class InstanceSource extends PrivateDjango::django::http::request::HttpRequest::InstanceSource {
+    abstract class InstanceSource extends PrivateDjango::DjangoImpl::Http::Request::HttpRequest::InstanceSource {
     }
 
     /** A direct instantiation of `rest_framework.request.Request`. */
@@ -295,19 +295,8 @@ private module RestFramework {
       result = API::moduleImport("rest_framework").getMember("response").getMember("Response")
     }
 
-    /**
-     * A source of instances of `rest_framework.response.Response`, extend this class to model new instances.
-     *
-     * This can include instantiations of the class, return values from function
-     * calls, or a special parameter that will be set when functions are called by an external
-     * library.
-     *
-     * Use the predicate `Response::instance()` to get references to instances of `rest_framework.response.Response`.
-     */
-    abstract class InstanceSource extends DataFlow::LocalSourceNode { }
-
     /** A direct instantiation of `rest_framework.response.Response`. */
-    private class ClassInstantiation extends PrivateDjango::django::http::response::HttpResponse::InstanceSource,
+    private class ClassInstantiation extends PrivateDjango::DjangoImpl::Http::Response::HttpResponse::InstanceSource,
       DataFlow::CallCfgNode {
       ClassInstantiation() { this = classRef().getACall() }
 
@@ -329,8 +318,8 @@ private module RestFramework {
    *
    * See https://www.django-rest-framework.org/api-guide/exceptions/#api-reference
    */
-  module APIException {
-    /** A direct instantiation of `rest_framework.exceptions.APIException` or subclass. */
+  module ApiException {
+    /** A direct instantiation of `rest_framework.exceptions.ApiException` or subclass. */
     private class ClassInstantiation extends HTTP::Server::HttpResponse::Range,
       DataFlow::CallCfgNode {
       string className;
@@ -366,4 +355,7 @@ private module RestFramework {
       override string getMimetypeDefault() { none() }
     }
   }
+
+  /** DEPRECATED: Alias for ApiException */
+  deprecated module APIException = ApiException;
 }
diff --git a/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll b/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll
index f7fc3157837..c1712e7e7eb 100644
--- a/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll
+++ b/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll
@@ -137,7 +137,7 @@ module SqlAlchemy {
    *
    * See https://docs.sqlalchemy.org/en/14/core/connections.html#dbapi-connections.
    */
-  module DBAPIConnection {
+  module DBApiConnection {
     /**
      * A source of instances of DB-API Connections, extend this class to model new instances.
      *
@@ -149,8 +149,8 @@ module SqlAlchemy {
      */
     abstract class InstanceSource extends DataFlow::LocalSourceNode { }
 
-    private class DBAPIConnectionSources extends InstanceSource, PEP249::Connection::InstanceSource {
-      DBAPIConnectionSources() {
+    private class DBApiConnectionSources extends InstanceSource, PEP249::Connection::InstanceSource {
+      DBApiConnectionSources() {
         this.(DataFlow::MethodCallNode).calls(Engine::instance(), "raw_connection")
         or
         this.(DataFlow::AttrRead).accesses(Connection::instance(), "connection")
@@ -169,6 +169,9 @@ module SqlAlchemy {
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
   }
 
+  /** DEPRECATED: Alias for DBApiConnection */
+  deprecated module DBAPIConnection = DBApiConnection;
+
   /**
    * Provides models for the `sqlalchemy.orm.Session` class
    *
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index c6a0538d2ef..8a030cc3f4f 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -13,6 +13,9 @@ private import semmle.python.frameworks.PEP249
 private import semmle.python.frameworks.internal.PoorMansFunctionResolution
 private import semmle.python.frameworks.internal.SelfRefMixin
 private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
+// modeling split over multiple files to keep this file from becoming too big
+private import semmle.python.frameworks.Stdlib.Urllib
+private import semmle.python.frameworks.Stdlib.Urllib2
 
 /** Provides models for the Python standard library. */
 module Stdlib {
@@ -87,7 +90,7 @@ module Stdlib {
    * https://github.com/python/cpython/blob/64f54b7ccd49764b0304e076bfd79b5482988f53/Lib/http/client.py#L175
    * and https://docs.python.org/3.9/library/email.compat32-message.html#email.message.Message
    */
-  module HTTPMessage {
+  module HttpMessage {
     /**
      * A source of instances of `http.client.HTTPMessage`, extend this class to model new instances.
      *
@@ -99,7 +102,7 @@ module Stdlib {
      */
     abstract class InstanceSource extends DataFlow::LocalSourceNode { }
 
-    /** Gets a reference to an instance of `http.client.HTTPMessage`. */
+    /** Gets a reference to an instance of `http.client.HttpMessage`. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -107,7 +110,7 @@ module Stdlib {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of `http.client.HTTPMessage`. */
+    /** Gets a reference to an instance of `http.client.HttpMessage`. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     /**
@@ -126,6 +129,9 @@ module Stdlib {
     }
   }
 
+  /** DEPRECATED: Alias for HttpMessage */
+  deprecated module HTTPMessage = HttpMessage;
+
   /**
    * Provides models for the `http.cookies.Morsel` class
    *
@@ -302,7 +308,7 @@ private module StdlibPrivate {
   API::Node os() { result = API::moduleImport("os") }
 
   /** Provides models for the `os` module. */
-  module os {
+  module OS {
     /** Gets a reference to the `os.path` module. */
     API::Node path() {
       result = os().getMember("path")
@@ -317,7 +323,7 @@ private module StdlibPrivate {
     }
 
     /** Provides models for the `os.path` module */
-    module path {
+    module OsPath {
       /** Gets a reference to the `os.path.join` function. */
       API::Node join() { result = path().getMember("join") }
     }
@@ -939,7 +945,7 @@ private module StdlibPrivate {
           // these raise errors if the file does not exist
           "getatime", "getmtime", "getctime", "getsize"
         ] and
-      this = os::path().getMember(name).getACall()
+      this = OS::path().getMember(name).getACall()
     }
 
     override DataFlow::Node getAPathArgument() {
@@ -955,7 +961,7 @@ private module StdlibPrivate {
 
   /** A call to `os.path.samefile` will raise an exception if an `os.stat()` call on either pathname fails. */
   private class OsPathSamefileCall extends FileSystemAccess::Range, DataFlow::CallCfgNode {
-    OsPathSamefileCall() { this = os::path().getMember("samefile").getACall() }
+    OsPathSamefileCall() { this = OS::path().getMember("samefile").getACall() }
 
     override DataFlow::Node getAPathArgument() {
       result in [
@@ -989,7 +995,7 @@ private module StdlibPrivate {
 
     OsPathComputation() {
       methodName = pathComputation() and
-      this = os::path().getMember(methodName).getACall()
+      this = OS::path().getMember(methodName).getACall()
     }
 
     DataFlow::Node getPathArg() {
@@ -1016,7 +1022,7 @@ private module StdlibPrivate {
    * See https://docs.python.org/3/library/os.path.html#os.path.normpath
    */
   private class OsPathNormpathCall extends Path::PathNormalization::Range, DataFlow::CallCfgNode {
-    OsPathNormpathCall() { this = os::path().getMember("normpath").getACall() }
+    OsPathNormpathCall() { this = OS::path().getMember("normpath").getACall() }
 
     override DataFlow::Node getPathArg() { result in [this.getArg(0), this.getArgByName("path")] }
   }
@@ -1026,7 +1032,7 @@ private module StdlibPrivate {
    * See https://docs.python.org/3/library/os.path.html#os.path.abspath
    */
   private class OsPathAbspathCall extends Path::PathNormalization::Range, DataFlow::CallCfgNode {
-    OsPathAbspathCall() { this = os::path().getMember("abspath").getACall() }
+    OsPathAbspathCall() { this = OS::path().getMember("abspath").getACall() }
 
     override DataFlow::Node getPathArg() { result in [this.getArg(0), this.getArgByName("path")] }
   }
@@ -1036,7 +1042,7 @@ private module StdlibPrivate {
    * See https://docs.python.org/3/library/os.path.html#os.path.realpath
    */
   private class OsPathRealpathCall extends Path::PathNormalization::Range, DataFlow::CallCfgNode {
-    OsPathRealpathCall() { this = os::path().getMember("realpath").getACall() }
+    OsPathRealpathCall() { this = OS::path().getMember("realpath").getACall() }
 
     override DataFlow::Node getPathArg() { result in [this.getArg(0), this.getArgByName("path")] }
   }
@@ -1137,7 +1143,7 @@ private module StdlibPrivate {
     override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
       exists(CallNode call |
         nodeTo.asCfgNode() = call and
-        call = os::path::join().getACall().asCfgNode() and
+        call = OS::OsPath::join().getACall().asCfgNode() and
         call.getAnArg() = nodeFrom.asCfgNode()
       )
       // TODO: Handle pathlib (like we do for os.path.join)
@@ -1656,7 +1662,7 @@ private module StdlibPrivate {
   API::Node cgi() { result = API::moduleImport("cgi") }
 
   /** Provides models for the `cgi` module. */
-  module cgi {
+  module Cgi {
     /**
      * Provides models for the `cgi.FieldStorage` class
      *
@@ -1780,42 +1786,63 @@ private module StdlibPrivate {
   // ---------------------------------------------------------------------------
   // BaseHTTPServer (Python 2 only)
   // ---------------------------------------------------------------------------
-  /** Gets a reference to the `BaseHTTPServer` module. */
-  API::Node baseHTTPServer() { result = API::moduleImport("BaseHTTPServer") }
+  /** Gets a reference to the `BaseHttpServer` module. */
+  API::Node baseHttpServer() { result = API::moduleImport("BaseHTTPServer") }
 
-  /** Provides models for the `BaseHTTPServer` module. */
-  module BaseHTTPServer {
+  /** DEPRECATED: Alias for baseHttpServer */
+  deprecated API::Node baseHTTPServer() { result = baseHttpServer() }
+
+  /** Provides models for the `BaseHttpServer` module. */
+  module BaseHttpServer {
     /**
      * Provides models for the `BaseHTTPServer.BaseHTTPRequestHandler` class (Python 2 only).
      */
-    module BaseHTTPRequestHandler {
-      /** Gets a reference to the `BaseHTTPServer.BaseHTTPRequestHandler` class. */
-      API::Node classRef() { result = baseHTTPServer().getMember("BaseHTTPRequestHandler") }
+    module BaseHttpRequestHandler {
+      /** Gets a reference to the `BaseHttpServer.BaseHttpRequestHandler` class. */
+      API::Node classRef() { result = baseHttpServer().getMember("BaseHTTPRequestHandler") }
     }
+
+    /** DEPRECATED: Alias for BaseHttpRequestHandler */
+    deprecated module BaseHTTPRequestHandler = BaseHttpRequestHandler;
   }
 
+  /** DEPRECATED: Alias for BaseHttpServer */
+  deprecated module BaseHTTPServer = BaseHttpServer;
+
   // ---------------------------------------------------------------------------
   // SimpleHTTPServer (Python 2 only)
   // ---------------------------------------------------------------------------
-  /** Gets a reference to the `SimpleHTTPServer` module. */
-  API::Node simpleHTTPServer() { result = API::moduleImport("SimpleHTTPServer") }
+  /** Gets a reference to the `SimpleHttpServer` module. */
+  API::Node simpleHttpServer() { result = API::moduleImport("SimpleHTTPServer") }
 
-  /** Provides models for the `SimpleHTTPServer` module. */
-  module SimpleHTTPServer {
+  /** DEPRECATED: Alias for simpleHttpServer */
+  deprecated API::Node simpleHTTPServer() { result = simpleHttpServer() }
+
+  /** Provides models for the `SimpleHttpServer` module. */
+  module SimpleHttpServer {
     /**
      * Provides models for the `SimpleHTTPServer.SimpleHTTPRequestHandler` class (Python 2 only).
      */
-    module SimpleHTTPRequestHandler {
-      /** Gets a reference to the `SimpleHTTPServer.SimpleHTTPRequestHandler` class. */
-      API::Node classRef() { result = simpleHTTPServer().getMember("SimpleHTTPRequestHandler") }
+    module SimpleHttpRequestHandler {
+      /** Gets a reference to the `SimpleHttpServer.SimpleHttpRequestHandler` class. */
+      API::Node classRef() { result = simpleHttpServer().getMember("SimpleHTTPRequestHandler") }
     }
+
+    /** DEPRECATED: Alias for SimpleHttpRequestHandler */
+    deprecated module SimpleHTTPRequestHandler = SimpleHttpRequestHandler;
   }
 
+  /** DEPRECATED: Alias for SimpleHttpServer */
+  deprecated module SimpleHTTPServer = SimpleHttpServer;
+
   // ---------------------------------------------------------------------------
   // CGIHTTPServer (Python 2 only)
   // ---------------------------------------------------------------------------
   /** Gets a reference to the `CGIHTTPServer` module. */
-  API::Node cgiHTTPServer() { result = API::moduleImport("CGIHTTPServer") }
+  API::Node cgiHttpServer() { result = API::moduleImport("CGIHTTPServer") }
+
+  /** DEPRECATED: Alias for cgiHttpServer */
+  deprecated API::Node cgiHTTPServer() { result = cgiHttpServer() }
 
   /** Provides models for the `CGIHTTPServer` module. */
   module CGIHTTPServer {
@@ -1824,7 +1851,7 @@ private module StdlibPrivate {
      */
     module CGIHTTPRequestHandler {
       /** Gets a reference to the `CGIHTTPServer.CGIHTTPRequestHandler` class. */
-      API::Node classRef() { result = cgiHTTPServer().getMember("CGIHTTPRequestHandler") }
+      API::Node classRef() { result = cgiHttpServer().getMember("CGIHTTPRequestHandler") }
     }
   }
 
@@ -1835,7 +1862,7 @@ private module StdlibPrivate {
   API::Node http() { result = API::moduleImport("http") }
 
   /** Provides models for the `http` module. */
-  module http {
+  module Http {
     // -------------------------------------------------------------------------
     // http.server
     // -------------------------------------------------------------------------
@@ -1843,27 +1870,33 @@ private module StdlibPrivate {
     API::Node server() { result = http().getMember("server") }
 
     /** Provides models for the `http.server` module */
-    module server {
+    module Server {
       /**
        * Provides models for the `http.server.BaseHTTPRequestHandler` class (Python 3 only).
        *
        * See https://docs.python.org/3.9/library/http.server.html#http.server.BaseHTTPRequestHandler.
        */
-      module BaseHTTPRequestHandler {
-        /** Gets a reference to the `http.server.BaseHTTPRequestHandler` class. */
+      module BaseHttpRequestHandler {
+        /** Gets a reference to the `http.server.BaseHttpRequestHandler` class. */
         API::Node classRef() { result = server().getMember("BaseHTTPRequestHandler") }
       }
 
+      /** DEPRECATED: Alias for BaseHttpRequestHandler */
+      deprecated module BaseHTTPRequestHandler = BaseHttpRequestHandler;
+
       /**
        * Provides models for the `http.server.SimpleHTTPRequestHandler` class (Python 3 only).
        *
        * See https://docs.python.org/3.9/library/http.server.html#http.server.SimpleHTTPRequestHandler.
        */
-      module SimpleHTTPRequestHandler {
-        /** Gets a reference to the `http.server.SimpleHTTPRequestHandler` class. */
+      module SimpleHttpRequestHandler {
+        /** Gets a reference to the `http.server.SimpleHttpRequestHandler` class. */
         API::Node classRef() { result = server().getMember("SimpleHTTPRequestHandler") }
       }
 
+      /** DEPRECATED: Alias for SimpleHttpRequestHandler */
+      deprecated module SimpleHTTPRequestHandler = SimpleHttpRequestHandler;
+
       /**
        * Provides models for the `http.server.CGIHTTPRequestHandler` class (Python 3 only).
        *
@@ -1883,27 +1916,30 @@ private module StdlibPrivate {
    *  - https://docs.python.org/3.9/library/http.server.html#http.server.BaseHTTPRequestHandler
    *  - https://docs.python.org/2.7/library/basehttpserver.html#BaseHTTPServer.BaseHTTPRequestHandler
    */
-  private module HTTPRequestHandler {
-    /** Gets a reference to the `BaseHTTPRequestHandler` class or any subclass. */
+  private module HttpRequestHandler {
+    /** Gets a reference to the `BaseHttpRequestHandler` class or any subclass. */
     API::Node subclassRef() {
       result =
         [
           // Python 2
-          BaseHTTPServer::BaseHTTPRequestHandler::classRef(),
-          SimpleHTTPServer::SimpleHTTPRequestHandler::classRef(),
+          BaseHttpServer::BaseHttpRequestHandler::classRef(),
+          SimpleHttpServer::SimpleHttpRequestHandler::classRef(),
           CGIHTTPServer::CGIHTTPRequestHandler::classRef(),
           // Python 3
-          http::server::BaseHTTPRequestHandler::classRef(),
-          http::server::SimpleHTTPRequestHandler::classRef(),
-          http::server::CGIHTTPRequestHandler::classRef()
+          Http::Server::BaseHttpRequestHandler::classRef(),
+          Http::Server::SimpleHttpRequestHandler::classRef(),
+          Http::Server::CGIHTTPRequestHandler::classRef()
         ].getASubclass*()
     }
 
-    /** A HTTPRequestHandler class definition (most likely in project code). */
-    class HTTPRequestHandlerClassDef extends Class {
-      HTTPRequestHandlerClassDef() { this.getParent() = subclassRef().getAUse().asExpr() }
+    /** A HttpRequestHandler class definition (most likely in project code). */
+    class HttpRequestHandlerClassDef extends Class {
+      HttpRequestHandlerClassDef() { this.getParent() = subclassRef().getAUse().asExpr() }
     }
 
+    /** DEPRECATED: Alias for HttpRequestHandlerClassDef */
+    deprecated class HTTPRequestHandlerClassDef = HttpRequestHandlerClassDef;
+
     /**
      * A source of instances of the `BaseHTTPRequestHandler` class or any subclass, extend this class to model new instances.
      *
@@ -1915,16 +1951,16 @@ private module StdlibPrivate {
      */
     abstract class InstanceSource extends DataFlow::Node { }
 
-    /** The `self` parameter in a method on the `BaseHTTPRequestHandler` class or any subclass. */
+    /** The `self` parameter in a method on the `BaseHttpRequestHandler` class or any subclass. */
     private class SelfParam extends InstanceSource, RemoteFlowSource::Range, DataFlow::ParameterNode {
       SelfParam() {
-        exists(HTTPRequestHandlerClassDef cls | cls.getAMethod().getArg(0) = this.getParameter())
+        exists(HttpRequestHandlerClassDef cls | cls.getAMethod().getArg(0) = this.getParameter())
       }
 
       override string getSourceType() { result = "stdlib HTTPRequestHandler" }
     }
 
-    /** Gets a reference to an instance of the `BaseHTTPRequestHandler` class or any subclass. */
+    /** Gets a reference to an instance of the `BaseHttpRequestHandler` class or any subclass. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -1932,7 +1968,7 @@ private module StdlibPrivate {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of the `BaseHTTPRequestHandler` class or any subclass. */
+    /** Gets a reference to an instance of the `BaseHttpRequestHandler` class or any subclass. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     private class AdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
@@ -1953,16 +1989,16 @@ private module StdlibPrivate {
       }
     }
 
-    /** An `HTTPMessage` instance that originates from a `BaseHTTPRequestHandler` instance. */
-    private class BaseHTTPRequestHandlerHeadersInstances extends Stdlib::HTTPMessage::InstanceSource {
-      BaseHTTPRequestHandlerHeadersInstances() {
+    /** An `HttpMessage` instance that originates from a `BaseHttpRequestHandler` instance. */
+    private class BaseHttpRequestHandlerHeadersInstances extends Stdlib::HttpMessage::InstanceSource {
+      BaseHttpRequestHandlerHeadersInstances() {
         this.(DataFlow::AttrRead).accesses(instance(), "headers")
       }
     }
 
-    /** A file-like object that originates from a `BaseHTTPRequestHandler` instance. */
-    private class BaseHTTPRequestHandlerFileLikeObjectInstances extends Stdlib::FileLikeObject::InstanceSource {
-      BaseHTTPRequestHandlerFileLikeObjectInstances() {
+    /** A file-like object that originates from a `BaseHttpRequestHandler` instance. */
+    private class BaseHttpRequestHandlerFileLikeObjectInstances extends Stdlib::FileLikeObject::InstanceSource {
+      BaseHttpRequestHandlerFileLikeObjectInstances() {
         this.(DataFlow::AttrRead).accesses(instance(), "rfile")
       }
     }
@@ -1974,7 +2010,7 @@ private module StdlibPrivate {
      */
     private class RequestHandlerFunc extends HTTP::Server::RequestHandler::Range {
       RequestHandlerFunc() {
-        this = any(HTTPRequestHandlerClassDef cls).getAMethod() and
+        this = any(HttpRequestHandlerClassDef cls).getAMethod() and
         this.getName() = "do_" + HTTP::httpVerb()
       }
 
@@ -2152,8 +2188,8 @@ private module StdlibPrivate {
    * - https://docs.python.org/2.7/library/httplib.html#httplib.HTTPConnection
    * - https://docs.python.org/2.7/library/httplib.html#httplib.HTTPSConnection
    */
-  module HTTPConnection {
-    /** Gets a reference to the `http.client.HTTPConnection` class. */
+  module HttpConnection {
+    /** Gets a reference to the `http.client.HttpConnection` class. */
     private API::Node classRef() {
       exists(string className | className in ["HTTPConnection", "HTTPSConnection"] |
         // Python 3
@@ -2181,7 +2217,7 @@ private module StdlibPrivate {
       abstract DataFlow::Node getHostArgument();
     }
 
-    /** A direct instantiation of `http.client.HTTPConnection`. */
+    /** A direct instantiation of `http.client.HttpConnection`. */
     private class ClassInstantiation extends InstanceSource, DataFlow::CallCfgNode {
       ClassInstantiation() { this = classRef().getACall() }
 
@@ -2209,7 +2245,7 @@ private module StdlibPrivate {
       instance(DataFlow::TypeTracker::end(), hostArg).flowsTo(result)
     }
 
-    /** A method call on a HTTPConnection that sends off a request */
+    /** A method call on a HttpConnection that sends off a request */
     private class RequestCall extends HTTP::Client::Request::Range, DataFlow::MethodCallNode {
       RequestCall() { this.calls(instance(_), ["request", "_send_request", "putrequest"]) }
 
@@ -2235,7 +2271,7 @@ private module StdlibPrivate {
 
     /** A call to the `getresponse` method. */
     private class HttpConnectionGetResponseCall extends DataFlow::MethodCallNode,
-      HTTPResponse::InstanceSource {
+      HttpResponse::InstanceSource {
       HttpConnectionGetResponseCall() { this.calls(instance(_), "getresponse") }
     }
 
@@ -2266,6 +2302,9 @@ private module StdlibPrivate {
     }
   }
 
+  /** DEPRECATED: Alias for HttpConnection */
+  deprecated module HTTPConnection = HttpConnection;
+
   /**
    * Provides models for the `http.client.HTTPResponse` class
    *
@@ -2273,8 +2312,8 @@ private module StdlibPrivate {
    * - https://docs.python.org/3.10/library/http.client.html#httpresponse-objects
    * - https://docs.python.org/3/library/http.client.html#http.client.HTTPResponse.
    */
-  module HTTPResponse {
-    /** Gets a reference to the `http.client.HTTPResponse` class. */
+  module HttpResponse {
+    /** Gets a reference to the `http.client.HttpResponse` class. */
     private API::Node classRef() {
       result = API::moduleImport("http").getMember("client").getMember("HTTPResponse")
     }
@@ -2293,12 +2332,12 @@ private module StdlibPrivate {
     abstract class InstanceSource extends Stdlib::FileLikeObject::InstanceSource,
       DataFlow::LocalSourceNode { }
 
-    /** A direct instantiation of `http.client.HTTPResponse`. */
+    /** A direct instantiation of `http.client.HttpResponse`. */
     private class ClassInstantiation extends InstanceSource, DataFlow::CallCfgNode {
       ClassInstantiation() { this = classRef().getACall() }
     }
 
-    /** Gets a reference to an instance of `http.client.HTTPResponse`. */
+    /** Gets a reference to an instance of `http.client.HttpResponse`. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -2306,7 +2345,7 @@ private module StdlibPrivate {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of `http.client.HTTPResponse`. */
+    /** Gets a reference to an instance of `http.client.HttpResponse`. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     /**
@@ -2324,9 +2363,9 @@ private module StdlibPrivate {
       override string getAsyncMethodName() { none() }
     }
 
-    /** An attribute read that is a HTTPMessage instance. */
-    private class HTTPMessageInstances extends Stdlib::HTTPMessage::InstanceSource {
-      HTTPMessageInstances() {
+    /** An attribute read that is a HttpMessage instance. */
+    private class HttpMessageInstances extends Stdlib::HttpMessage::InstanceSource {
+      HttpMessageInstances() {
         this.(DataFlow::AttrRead).accesses(instance(), ["headers", "msg"])
         or
         this.(DataFlow::MethodCallNode).calls(instance(), "info")
@@ -2334,11 +2373,15 @@ private module StdlibPrivate {
     }
   }
 
+  /** DEPRECATED: Alias for HttpResponse */
+  deprecated module HTTPResponse = HttpResponse;
+
   // ---------------------------------------------------------------------------
   // sqlite3
   // ---------------------------------------------------------------------------
   /**
-   * sqlite3 implements PEP 249, providing ways to execute SQL statements against a database.
+   * A model of sqlite3 as a module that implements PEP 249, providing ways to execute SQL statements
+   * against a database.
    *
    * See https://devdocs.io/python~3.9/library/sqlite3
    */
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/Urllib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib/Urllib.qll
new file mode 100644
index 00000000000..79aacc0818f
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/Urllib.qll
@@ -0,0 +1,71 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `urllib` module, part of
+ * the Python standard library.
+ *
+ * See
+ * - https://docs.python.org/2/library/urllib.html
+ * - https://docs.python.org/3/library/urllib.html
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `urllib` module, part of
+ * the Python standard library.
+ *
+ * See
+ * - https://docs.python.org/2/library/urllib.html
+ * - https://docs.python.org/3/library/urllib.html
+ */
+private module Urllib {
+  /**
+   * Provides models for the `urllib.request` extension library
+   *
+   * See https://docs.python.org/3.9/library/urllib.request.html
+   */
+  module Request {
+    /**
+     * See
+     * - https://docs.python.org/3.9/library/urllib.request.html#urllib.request.Request
+     */
+    private class RequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+      RequestCall() {
+        this = API::moduleImport("urllib").getMember("request").getMember("Request").getACall()
+      }
+
+      override DataFlow::Node getAUrlPart() { result in [this.getArg(0), this.getArgByName("url")] }
+
+      override string getFramework() { result = "urllib.request.Request" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        // TODO: Look into disabling certificate validation
+        none()
+      }
+    }
+
+    /**
+     * See
+     * - https://docs.python.org/3.9/library/urllib.request.html#urllib.request.urlopen
+     */
+    private class UrlOpenCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+      UrlOpenCall() {
+        this = API::moduleImport("urllib").getMember("request").getMember("urlopen").getACall()
+      }
+
+      override DataFlow::Node getAUrlPart() { result in [this.getArg(0), this.getArgByName("url")] }
+
+      override string getFramework() { result = "urllib.request.urlopen" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        // TODO: Look into disabling certificate validation
+        none()
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib/Urllib2.qll b/python/ql/lib/semmle/python/frameworks/Stdlib/Urllib2.qll
new file mode 100644
index 00000000000..ea15ae4bd33
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib/Urllib2.qll
@@ -0,0 +1,56 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `urllib2` module, part of
+ * the Python 2 standard library.
+ *
+ * See https://docs.python.org/2/library/urllib2.html
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the the `urllib2` module, part of
+ * the Python 2 standard library.
+ *
+ * See https://docs.python.org/2/library/urllib2.html
+ */
+private module Urllib2 {
+  /**
+   * See
+   * - https://docs.python.org/2/library/urllib2.html#urllib2.Request
+   */
+  private class RequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+    RequestCall() { this = API::moduleImport("urllib2").getMember("Request").getACall() }
+
+    override DataFlow::Node getAUrlPart() { result in [this.getArg(0), this.getArgByName("url")] }
+
+    override string getFramework() { result = "urllib2.Request" }
+
+    override predicate disablesCertificateValidation(
+      DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+    ) {
+      // TODO: Look into disabling certificate validation
+      none()
+    }
+  }
+
+  /**
+   * See
+   * - https://docs.python.org/2/library/urllib2.html#urllib2.urlopen
+   */
+  private class UrlOpenCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+    UrlOpenCall() { this = API::moduleImport("urllib2").getMember("urlopen").getACall() }
+
+    override DataFlow::Node getAUrlPart() { result in [this.getArg(0), this.getArgByName("url")] }
+
+    override string getFramework() { result = "urllib2.urlopen" }
+
+    override predicate disablesCertificateValidation(
+      DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+    ) {
+      // TODO: Look into disabling certificate validation
+      none()
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/Tornado.qll b/python/ql/lib/semmle/python/frameworks/Tornado.qll
index 91ae3ac2575..8a28fdd61cb 100644
--- a/python/ql/lib/semmle/python/frameworks/Tornado.qll
+++ b/python/ql/lib/semmle/python/frameworks/Tornado.qll
@@ -23,7 +23,7 @@ private module Tornado {
    *
    * See https://www.tornadoweb.org/en/stable/httputil.html#tornado.httputil.HTTPHeaders.
    */
-  module HTTPHeaders {
+  module HttpHeaders {
     /**
      * A source of instances of `tornado.httputil.HTTPHeaders`, extend this class to model new instances.
      *
@@ -35,7 +35,7 @@ private module Tornado {
      */
     abstract class InstanceSource extends DataFlow::LocalSourceNode { }
 
-    /** Gets a reference to an instance of `tornado.httputil.HTTPHeaders`. */
+    /** Gets a reference to an instance of `tornado.httputil.HttpHeaders`. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -43,7 +43,7 @@ private module Tornado {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of `tornado.httputil.HTTPHeaders`. */
+    /** Gets a reference to an instance of `tornado.httputil.HttpHeaders`. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     /**
@@ -62,6 +62,9 @@ private module Tornado {
     }
   }
 
+  /** DEPRECATED: Alias for HttpHeaders */
+  deprecated module HTTPHeaders = HttpHeaders;
+
   // ---------------------------------------------------------------------------
   // tornado
   // ---------------------------------------------------------------------------
@@ -69,7 +72,7 @@ private module Tornado {
   API::Node tornado() { result = API::moduleImport("tornado") }
 
   /** Provides models for the `tornado` module. */
-  module tornado {
+  module TornadoModule {
     // -------------------------------------------------------------------------
     // tornado.web
     // -------------------------------------------------------------------------
@@ -77,7 +80,7 @@ private module Tornado {
     API::Node web() { result = tornado().getMember("web") }
 
     /** Provides models for the `tornado.web` module */
-    module web {
+    module Web {
       /**
        * Provides models for the `tornado.web.RequestHandler` class and subclasses.
        *
@@ -102,7 +105,7 @@ private module Tornado {
           /** Gets a reference to this class. */
           private DataFlow::TypeTrackingNode getARef(DataFlow::TypeTracker t) {
             t.start() and
-            result.asExpr().(ClassExpr) = this.getParent()
+            result.asExpr() = this.getParent()
             or
             exists(DataFlow::TypeTracker t2 | result = this.getARef(t2).track(t2, t))
           }
@@ -196,7 +199,7 @@ private module Tornado {
           override string getAsyncMethodName() { none() }
         }
 
-        private class RequestAttrAccess extends tornado::httputil::HttpServerRequest::InstanceSource {
+        private class RequestAttrAccess extends TornadoModule::HttpUtil::HttpServerRequest::InstanceSource {
           RequestAttrAccess() {
             this.(DataFlow::AttrRead).getObject() = instance() and
             this.(DataFlow::AttrRead).getAttributeName() = "request"
@@ -260,7 +263,7 @@ private module Tornado {
     API::Node httputil() { result = tornado().getMember("httputil") }
 
     /** Provides models for the `tornado.httputil` module */
-    module httputil {
+    module HttpUtil {
       /**
        * Provides models for the `tornado.httputil.HttpServerRequest` class
        *
@@ -323,9 +326,9 @@ private module Tornado {
           override string getAsyncMethodName() { none() }
         }
 
-        /** An `HTTPHeaders` instance that originates from a Tornado request. */
-        private class TornadoRequestHTTPHeadersInstances extends HTTPHeaders::InstanceSource {
-          TornadoRequestHTTPHeadersInstances() {
+        /** An `HttpHeaders` instance that originates from a Tornado request. */
+        private class TornadoRequestHttpHeadersInstances extends HttpHeaders::InstanceSource {
+          TornadoRequestHttpHeadersInstances() {
             this.(DataFlow::AttrRead).accesses(instance(), "headers")
           }
         }
@@ -354,14 +357,16 @@ private module Tornado {
   // ---------------------------------------------------------------------------
   // routing
   // ---------------------------------------------------------------------------
-  /** A sequence that defines a number of route rules */
+  /** Gets a sequence that defines a number of route rules */
   SequenceNode routeSetupRuleList() {
-    exists(CallNode call | call = any(tornado::web::Application::ClassInstantiation c).asCfgNode() |
+    exists(CallNode call |
+      call = any(TornadoModule::Web::Application::ClassInstantiation c).asCfgNode()
+    |
       result in [call.getArg(0), call.getArgByName("handlers")]
     )
     or
     exists(CallNode call |
-      call.getFunction() = tornado::web::Application::add_handlers().asCfgNode()
+      call.getFunction() = TornadoModule::Web::Application::add_handlers().asCfgNode()
     |
       result in [call.getArg(1), call.getArgByName("host_handlers")]
     )
@@ -403,7 +408,7 @@ private module Tornado {
     override DataFlow::Node getUrlPatternArg() { result.asCfgNode() = node.getElement(0) }
 
     override Function getARequestHandler() {
-      exists(tornado::web::RequestHandler::RequestHandlerClass cls |
+      exists(TornadoModule::Web::RequestHandler::RequestHandlerClass cls |
         cls.getARef().asCfgNode() = node.getElement(1) and
         result = cls.getARequestHandler()
       )
@@ -434,7 +439,7 @@ private module Tornado {
   /** A request handler defined in a tornado RequestHandler class, that has no known route. */
   private class TornadoRequestHandlerWithoutKnownRoute extends HTTP::Server::RequestHandler::Range {
     TornadoRequestHandlerWithoutKnownRoute() {
-      exists(tornado::web::RequestHandler::RequestHandlerClass cls |
+      exists(TornadoModule::Web::RequestHandler::RequestHandlerClass cls |
         cls.getARequestHandler() = this
       ) and
       not exists(TornadoRouteSetup setup | setup.getARequestHandler() = this)
@@ -462,7 +467,7 @@ private module Tornado {
   private class TornadoRequestHandlerRedirectCall extends HTTP::Server::HttpRedirectResponse::Range,
     DataFlow::CallCfgNode {
     TornadoRequestHandlerRedirectCall() {
-      this.getFunction() = tornado::web::RequestHandler::redirectMethod()
+      this.getFunction() = TornadoModule::Web::RequestHandler::redirectMethod()
     }
 
     override DataFlow::Node getRedirectLocation() {
@@ -484,7 +489,7 @@ private module Tornado {
   private class TornadoRequestHandlerWriteCall extends HTTP::Server::HttpResponse::Range,
     DataFlow::CallCfgNode {
     TornadoRequestHandlerWriteCall() {
-      this.getFunction() = tornado::web::RequestHandler::writeMethod()
+      this.getFunction() = TornadoModule::Web::RequestHandler::writeMethod()
     }
 
     override DataFlow::Node getBody() { result in [this.getArg(0), this.getArgByName("chunk")] }
@@ -502,7 +507,7 @@ private module Tornado {
   class TornadoRequestHandlerSetCookieCall extends HTTP::Server::CookieWrite::Range,
     DataFlow::MethodCallNode {
     TornadoRequestHandlerSetCookieCall() {
-      this.calls(tornado::web::RequestHandler::instance(), "set_cookie")
+      this.calls(TornadoModule::Web::RequestHandler::instance(), "set_cookie")
     }
 
     override DataFlow::Node getHeaderArg() { none() }
diff --git a/python/ql/lib/semmle/python/frameworks/Urllib3.qll b/python/ql/lib/semmle/python/frameworks/Urllib3.qll
new file mode 100644
index 00000000000..ab94a668c2b
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Urllib3.qll
@@ -0,0 +1,75 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `urllib3` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/urllib3/
+ * - https://urllib3.readthedocs.io/en/stable/reference/
+ */
+
+private import python
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `urllib3` PyPI package.
+ *
+ * See
+ * - https://pypi.org/project/urllib3/
+ * - https://urllib3.readthedocs.io/en/stable/reference/
+ */
+private module Urllib3 {
+  /**
+   * Provides models for the `urllib3.request.RequestMethods` class and subclasses, such
+   * as the `urllib3.PoolManager` class
+   *
+   * See
+   * - https://urllib3.readthedocs.io/en/stable/reference/urllib3.request.html#urllib3.request.RequestMethods
+   *
+   *
+   * https://urllib3.readthedocs.io/en/stable/reference/urllib3.poolmanager.html.
+   */
+  module PoolManager {
+    /** Gets a reference to the `urllib3.PoolManager` class. */
+    private API::Node classRef() {
+      result =
+        API::moduleImport("urllib3")
+            .getMember(["PoolManager", "ProxyManager", "HTTPConnectionPool", "HTTPSConnectionPool"])
+      or
+      result =
+        API::moduleImport("urllib3")
+            .getMember("request")
+            .getMember("RequestMethods")
+            .getASubclass+()
+    }
+
+    /** Gets a reference to an instance of a `urllib3.request.RequestMethods` subclass. */
+    private API::Node instance() { result = classRef().getReturn() }
+
+    /**
+     * A call to a method making an outgoing request.
+     *
+     * See
+     * - https://urllib3.readthedocs.io/en/stable/reference/urllib3.request.html#urllib3.request.RequestMethods
+     * - https://urllib3.readthedocs.io/en/stable/reference/urllib3.connectionpool.html#urllib3.HTTPConnectionPool.urlopen
+     */
+    private class RequestCall extends HTTP::Client::Request::Range, DataFlow::CallCfgNode {
+      RequestCall() {
+        this =
+          instance()
+              .getMember(["request", "request_encode_url", "request_encode_body", "urlopen"])
+              .getACall()
+      }
+
+      override DataFlow::Node getAUrlPart() { result in [this.getArg(1), this.getArgByName("url")] }
+
+      override string getFramework() { result = "urllib3.PoolManager" }
+
+      override predicate disablesCertificateValidation(
+        DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
+      ) {
+        // TODO: Look into disabling certificate validation
+        none()
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
index 36f03cd1401..c2a24358ad2 100644
--- a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
+++ b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
@@ -34,7 +34,7 @@ private module NotExposed {
         concat(string newModelFullyQualified |
           newModel(any(MySpec spec), newModelFullyQualified, _, _, _)
         |
-          fullyQualifiedToAPIGraphPath(newModelFullyQualified), " or this = API::"
+          fullyQualifiedToApiGraphPath(newModelFullyQualified), " or this = API::"
         )
   }
 
@@ -69,10 +69,15 @@ private module NotExposed {
   //
   //
   bindingset[fullyQaulified]
-  string fullyQualifiedToAPIGraphPath(string fullyQaulified) {
+  string fullyQualifiedToApiGraphPath(string fullyQaulified) {
     result = "moduleImport(\"" + fullyQaulified.replaceAll(".", "\").getMember(\"") + "\")"
   }
 
+  /** DEPRECATED: Alias for fullyQualifiedToApiGraphPath */
+  deprecated string fullyQualifiedToAPIGraphPath(string fullyQaulified) {
+    result = fullyQualifiedToApiGraphPath(fullyQaulified)
+  }
+
   bindingset[this]
   abstract class FindSubclassesSpec extends string {
     abstract API::Node getAlreadyModeledClass();
@@ -99,13 +104,13 @@ private module NotExposed {
     or
     exists(string newSubclassName |
       newModel(spec, newSubclassName, _, _, _) and
-      result.getPath() = fullyQualifiedToAPIGraphPath(newSubclassName)
+      result.getPath() = fullyQualifiedToApiGraphPath(newSubclassName)
     )
   }
 
   bindingset[fullyQualifiedName]
   predicate alreadyModeled(FindSubclassesSpec spec, string fullyQualifiedName) {
-    fullyQualifiedToAPIGraphPath(fullyQualifiedName) = spec.getAlreadyModeledClass().getPath()
+    fullyQualifiedToApiGraphPath(fullyQualifiedName) = spec.getAlreadyModeledClass().getPath()
   }
 
   predicate isNonTestProjectCode(AstNode ast) {
diff --git a/python/ql/lib/semmle/python/libraries/Zope.qll b/python/ql/lib/semmle/python/libraries/Zope.qll
index 728c334352b..fea3cecf418 100644
--- a/python/ql/lib/semmle/python/libraries/Zope.qll
+++ b/python/ql/lib/semmle/python/libraries/Zope.qll
@@ -3,26 +3,6 @@
 import python
 private import semmle.python.pointsto.PointsTo
 
-/** A method that to a sub-class of `zope.interface.Interface` */
-deprecated class ZopeInterfaceMethod extends PyFunctionObject {
-  /** Holds if this method belongs to a class that sub-classes `zope.interface.Interface` */
-  ZopeInterfaceMethod() {
-    exists(Object interface, ClassObject owner |
-      interface = ModuleObject::named("zope.interface").attr("Interface") and
-      owner.declaredAttribute(_) = this and
-      owner.getAnImproperSuperType().getABaseType() = interface
-    )
-  }
-
-  override int minParameters() { result = super.minParameters() + 1 }
-
-  override int maxParameters() {
-    if exists(this.getFunction().getVararg())
-    then result = super.maxParameters()
-    else result = super.maxParameters() + 1
-  }
-}
-
 /** A method that belongs to a sub-class of `zope.interface.Interface` */
 class ZopeInterfaceMethodValue extends PythonFunctionValue {
   /** Holds if this method belongs to a class that sub-classes `zope.interface.Interface` */
diff --git a/python/ql/lib/semmle/python/objects/Callables.qll b/python/ql/lib/semmle/python/objects/Callables.qll
index 51383d4870c..357779859bb 100644
--- a/python/ql/lib/semmle/python/objects/Callables.qll
+++ b/python/ql/lib/semmle/python/objects/Callables.qll
@@ -53,7 +53,7 @@ abstract class CallableObjectInternal extends ObjectInternal {
   override ObjectInternal getIterNext() { none() }
 }
 
-/** Class representing Python functions */
+/** A Python function. */
 class PythonFunctionObjectInternal extends CallableObjectInternal, TPythonFunctionObject {
   override Function getScope() {
     exists(CallableExpr expr |
@@ -167,7 +167,7 @@ private BasicBlock blockReturningNone(Function func) {
   )
 }
 
-/** Class representing built-in functions such as `len` or `print`. */
+/** A built-in function such as `len` or `print`. */
 class BuiltinFunctionObjectInternal extends CallableObjectInternal, TBuiltinFunctionObject {
   override Builtin getBuiltin() { this = TBuiltinFunctionObject(result) }
 
@@ -290,7 +290,7 @@ private Builtin getBuiltinFunctionReturnType(Builtin func) {
   )
 }
 
-/** Class representing methods of built-in classes (otherwise known as method-descriptors) such as `list.append`. */
+/** A method of a built-in class (otherwise known as method-descriptors) such as `list.append`. */
 class BuiltinMethodObjectInternal extends CallableObjectInternal, TBuiltinMethodObject {
   override Builtin getBuiltin() { this = TBuiltinMethodObject(result) }
 
@@ -380,7 +380,7 @@ class BuiltinMethodObjectInternal extends CallableObjectInternal, TBuiltinMethod
 }
 
 /**
- * Class representing bound-methods.
+ * A bound-method.
  * Note that built-in methods, such as `[].append` are also represented as bound-methods.
  * Although built-in methods and bound-methods are distinct classes in CPython, their behavior
  * is the same and we treat them identically.
diff --git a/python/ql/lib/semmle/python/objects/Classes.qll b/python/ql/lib/semmle/python/objects/Classes.qll
index 249fb331466..998651a93bf 100644
--- a/python/ql/lib/semmle/python/objects/Classes.qll
+++ b/python/ql/lib/semmle/python/objects/Classes.qll
@@ -6,7 +6,7 @@ private import semmle.python.pointsto.PointsToContext
 private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
 
-/** Class representing classes */
+/** A class. */
 abstract class ClassObjectInternal extends ObjectInternal {
   override string getName() { result = this.getClassDeclaration().getName() }
 
@@ -109,7 +109,7 @@ abstract class ClassObjectInternal extends ObjectInternal {
   override predicate isNotSubscriptedType() { any() }
 }
 
-/** Class representing Python source classes */
+/** A class that is defined in Python source. */
 class PythonClassObjectInternal extends ClassObjectInternal, TPythonClassObject {
   /** Gets the scope for this Python class */
   Class getScope() {
@@ -163,7 +163,7 @@ class PythonClassObjectInternal extends ClassObjectInternal, TPythonClassObject
   }
 }
 
-/** Class representing built-in classes, except `type` */
+/** A built-in class, except `type`. */
 class BuiltinClassObjectInternal extends ClassObjectInternal, TBuiltinClassObject {
   override Builtin getBuiltin() { this = TBuiltinClassObject(result) }
 
diff --git a/python/ql/lib/semmle/python/objects/Constants.qll b/python/ql/lib/semmle/python/objects/Constants.qll
index 2f5c062e63a..ae5403a3f9e 100644
--- a/python/ql/lib/semmle/python/objects/Constants.qll
+++ b/python/ql/lib/semmle/python/objects/Constants.qll
@@ -7,7 +7,7 @@ private import semmle.python.pointsto.PointsToContext
 private import semmle.python.types.Builtins
 
 /**
- * Class representing constants.
+ * A constant.
  * Includes `None`, `True` and `False` as
  * well as strings and integers.
  */
diff --git a/python/ql/lib/semmle/python/objects/Descriptors.qll b/python/ql/lib/semmle/python/objects/Descriptors.qll
index 4022f1fdf44..2c18708e16a 100644
--- a/python/ql/lib/semmle/python/objects/Descriptors.qll
+++ b/python/ql/lib/semmle/python/objects/Descriptors.qll
@@ -6,7 +6,7 @@ private import semmle.python.pointsto.PointsToContext
 private import semmle.python.pointsto.MRO
 private import semmle.python.types.Builtins
 
-/** Class representing property objects in Python */
+/** A property object. */
 class PropertyInternal extends ObjectInternal, TProperty {
   /** Gets the name of this property */
   override string getName() { result = this.getGetter().getName() }
diff --git a/python/ql/lib/semmle/python/objects/Instances.qll b/python/ql/lib/semmle/python/objects/Instances.qll
index 9569fa1a25d..d1282b89a32 100644
--- a/python/ql/lib/semmle/python/objects/Instances.qll
+++ b/python/ql/lib/semmle/python/objects/Instances.qll
@@ -178,7 +178,6 @@ class SelfInstanceInternal extends TSelfInstance, InstanceObject {
     result = "self instance of " + this.getClass().(ClassObjectInternal).getName()
   }
 
-  /** The boolean value of this object, if it has one */
   override boolean booleanValue() {
     //result = this.getClass().instancesBooleanValue()
     result = maybe()
diff --git a/python/ql/lib/semmle/python/objects/ObjectAPI.qll b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
index 5e0efa612b2..f47244a74c2 100644
--- a/python/ql/lib/semmle/python/objects/ObjectAPI.qll
+++ b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
@@ -18,7 +18,7 @@ private import semmle.python.types.Builtins
 
 class ObjectSource = Object;
 
-/* Aliases for scopes */
+/** An alias for Function used for scopes */
 class FunctionScope = Function;
 
 class ClassScope = Class;
@@ -26,7 +26,7 @@ class ClassScope = Class;
 class ModuleScope = Module;
 
 /**
- * Class representing values in the Python program
+ * A value in the Python program.
  * Each `Value` is a static approximation to a set of one or more real objects.
  */
 class Value extends TObject {
@@ -144,7 +144,7 @@ class Value extends TObject {
 }
 
 /**
- * Class representing modules in the Python program
+ * A module in the Python program.
  * Each `ModuleValue` represents a module object in the Python program.
  */
 class ModuleValue extends Value instanceof ModuleObjectInternal {
@@ -339,7 +339,7 @@ module Value {
 }
 
 /**
- * Class representing callables in the Python program
+ * A callable in the Python program.
  * Callables include Python functions, built-in functions and bound-methods,
  * but not classes.
  */
@@ -447,7 +447,7 @@ class CallableValue extends Value {
 }
 
 /**
- * Class representing bound-methods, such as `o.func`, where `o` is an instance
+ * A bound-method, such as `o.func`, where `o` is an instance
  * of a class that has a callable attribute `func`.
  */
 class BoundMethodValue extends CallableValue instanceof BoundMethodObjectInternal {
@@ -468,7 +468,7 @@ class BoundMethodValue extends CallableValue instanceof BoundMethodObjectInterna
 }
 
 /**
- * Class representing classes in the Python program, both Python and built-in.
+ * A class in the Python program, both Python and built-in.
  */
 class ClassValue extends Value {
   ClassValue() { this.(ObjectInternal).isClass() = true }
@@ -655,7 +655,7 @@ class ClassValue extends Value {
 }
 
 /**
- * Class representing functions in the Python program, both Python and built-in.
+ * A function in the Python program, both Python and built-in.
  * Note that this does not include other callables such as bound-methods.
  */
 abstract class FunctionValue extends CallableValue {
@@ -721,7 +721,7 @@ abstract class FunctionValue extends CallableValue {
   predicate isLambda() { this.getOrigin().getNode() instanceof Lambda }
 }
 
-/** Class representing Python functions */
+/** A Python function. */
 class PythonFunctionValue extends FunctionValue {
   PythonFunctionValue() { this instanceof PythonFunctionObjectInternal }
 
@@ -769,7 +769,7 @@ class PythonFunctionValue extends FunctionValue {
   }
 }
 
-/** Class representing builtin functions, such as `len` or `print` */
+/** A builtin function, such as `len` or `print`. */
 class BuiltinFunctionValue extends FunctionValue {
   BuiltinFunctionValue() { this instanceof BuiltinFunctionObjectInternal }
 
@@ -796,7 +796,7 @@ class BuiltinFunctionValue extends FunctionValue {
   }
 }
 
-/** Class representing builtin methods, such as `list.append` or `set.add` */
+/** A builtin method, such as `list.append` or `set.add` */
 class BuiltinMethodValue extends FunctionValue {
   BuiltinMethodValue() { this instanceof BuiltinMethodObjectInternal }
 
diff --git a/python/ql/lib/semmle/python/objects/ObjectInternal.qll b/python/ql/lib/semmle/python/objects/ObjectInternal.qll
index 68c2187bf59..16add4c370d 100644
--- a/python/ql/lib/semmle/python/objects/ObjectInternal.qll
+++ b/python/ql/lib/semmle/python/objects/ObjectInternal.qll
@@ -21,7 +21,7 @@ class ObjectInternal extends TObject {
   abstract string toString();
 
   /**
-   * The boolean value of this object, this may be both
+   * Gets the boolean value of this object. This may be both
    * true and false if the "object" represents a set of possible objects.
    */
   abstract boolean booleanValue();
@@ -88,14 +88,14 @@ class ObjectInternal extends TObject {
   abstract predicate callResult(PointsToContext callee, ObjectInternal obj, CfgOrigin origin);
 
   /**
-   * The integer value of things that have integer values and whose integer value is
+   * Gets the integer value of things that have integer values and whose integer value is
    * tracked.
    * That is, some ints, mainly small numbers, and bools.
    */
   abstract int intValue();
 
   /**
-   * The string value of things that have string values.
+   * Gets the string value of things that have string values.
    * That is, strings.
    */
   abstract string strValue();
@@ -497,7 +497,7 @@ module ObjectInternal {
 
   ObjectInternal superType() { result = TBuiltinClassObject(Builtin::special("super")) }
 
-  /** The old-style class type (Python 2 only) */
+  /** Gets the old-style class type (Python 2 only) */
   ObjectInternal classType() { result = TBuiltinClassObject(Builtin::special("ClassType")) }
 
   ObjectInternal emptyTuple() { result.(BuiltinTupleObjectInternal).length() = 0 }
diff --git a/python/ql/lib/semmle/python/objects/Sequences.qll b/python/ql/lib/semmle/python/objects/Sequences.qll
index 8bff82b872a..1250477be7c 100644
--- a/python/ql/lib/semmle/python/objects/Sequences.qll
+++ b/python/ql/lib/semmle/python/objects/Sequences.qll
@@ -90,16 +90,8 @@ abstract class TupleObjectInternal extends SequenceObjectInternal {
     none()
   }
 
-  /**
-   * The integer value of things that have integer values.
-   * That is, ints and bools.
-   */
   override int intValue() { none() }
 
-  /**
-   * The integer value of things that have integer values.
-   * That is, strings.
-   */
   override string strValue() { none() }
 
   override predicate calleeAndOffset(Function scope, int paramOffset) { none() }
@@ -241,16 +233,8 @@ class SysVersionInfoObjectInternal extends TSysVersionInfo, SequenceObjectIntern
     none()
   }
 
-  /**
-   * The integer value of things that have integer values.
-   * That is, ints and bools.
-   */
   override int intValue() { none() }
 
-  /**
-   * The integer value of things that have integer values.
-   * That is, strings.
-   */
   override string strValue() { none() }
 
   override predicate calleeAndOffset(Function scope, int paramOffset) { none() }
@@ -261,10 +245,6 @@ class SysVersionInfoObjectInternal extends TSysVersionInfo, SequenceObjectIntern
 
   override predicate subscriptUnknown() { none() }
 
-  /**
-   * Gets the length of the sequence that this "object" represents.
-   * Always returns a value for a sequence, will be -1 if object has no fixed length.
-   */
   override int length() { result = 5 }
 
   override predicate functionAndOffset(CallableObjectInternal function, int offset) { none() }
diff --git a/python/ql/lib/semmle/python/objects/TObject.qll b/python/ql/lib/semmle/python/objects/TObject.qll
index 2d6e225a131..9b3c9f4759f 100644
--- a/python/ql/lib/semmle/python/objects/TObject.qll
+++ b/python/ql/lib/semmle/python/objects/TObject.qll
@@ -453,7 +453,7 @@ predicate common_module_name(string name) { name = ["zope.interface", "six.moves
  * This acts as a helper for ClassObjectInternal allowing some lookup without
  * recursion.
  */
-library class ClassDecl extends @py_object {
+class ClassDecl extends @py_object {
   ClassDecl() {
     this.(Builtin).isClass() and not this = Builtin::unknownType()
     or
diff --git a/python/ql/lib/semmle/python/pointsto/Base.qll b/python/ql/lib/semmle/python/pointsto/Base.qll
index bff183d0efe..2317f045b26 100644
--- a/python/ql/lib/semmle/python/pointsto/Base.qll
+++ b/python/ql/lib/semmle/python/pointsto/Base.qll
@@ -25,13 +25,13 @@ module BasePointsTo {
   }
 }
 
-/** The kwargs parameter (**kwargs) in a function definition is always a dict */
+/** Gets the kwargs parameter (`**kwargs`). In a function definition this is always a dict. */
 predicate kwargs_points_to(ControlFlowNode f, ClassObject cls) {
   exists(Function func | func.getKwarg() = f.getNode()) and
   cls = theDictType()
 }
 
-/** The varargs (*varargs) in a function definition is always a tuple */
+/** Gets the varargs parameter (`*varargs`). In a function definition this is always a tuple. */
 predicate varargs_points_to(ControlFlowNode f, ClassObject cls) {
   exists(Function func | func.getVararg() = f.getNode()) and
   cls = theTupleType()
@@ -120,11 +120,11 @@ int version_tuple_compare(Object t) {
   version_tuple_value(t) > major_minor() and result = 1
 }
 
-/* Holds if `cls` is a new-style class if it were to have no explicit base classes */
+/** Holds if `cls` is a new-style class if it were to have no explicit base classes */
 predicate baseless_is_new_style(ClassObject cls) {
   cls.isBuiltin()
   or
-  major_version() = 3
+  major_version() = 3 and exists(cls)
   or
   exists(cls.declaredMetaClass())
 }
@@ -185,22 +185,6 @@ predicate function_can_never_return(FunctionObject func) {
   func = ModuleObject::named("sys").attr("exit")
 }
 
-private newtype TIterationDefinition =
-  TIterationDefinition_(SsaSourceVariable var, ControlFlowNode def, ControlFlowNode sequence) {
-    SsaSource::iteration_defined_variable(var, def, sequence)
-  }
-
-/**
- * DEPRECATED. For backwards compatibility only.
- * A definition of a variable in a for loop `for v in ...:`
- */
-deprecated class IterationDefinition extends TIterationDefinition {
-  /** Gets a textual representation of this element. */
-  string toString() { result = "IterationDefinition" }
-
-  ControlFlowNode getSequence() { this = TIterationDefinition_(_, _, result) }
-}
-
 /** Hold if outer contains inner, both are contained within a test and inner is a use is a plain use or an attribute lookup */
 pragma[noinline]
 predicate contains_interesting_expression_within_test(ControlFlowNode outer, ControlFlowNode inner) {
diff --git a/python/ql/lib/semmle/python/pointsto/CallGraph.qll b/python/ql/lib/semmle/python/pointsto/CallGraph.qll
index 545dd945cf1..da225439588 100644
--- a/python/ql/lib/semmle/python/pointsto/CallGraph.qll
+++ b/python/ql/lib/semmle/python/pointsto/CallGraph.qll
@@ -23,6 +23,8 @@ private newtype TTInvocation =
   }
 
 /**
+ * A function invocation.
+ *
  * This class represents a static approximation to the
  * dynamic call-graph. A `FunctionInvocation` represents
  * all calls made to a function for a given context.
diff --git a/python/ql/lib/semmle/python/pointsto/Final.qll b/python/ql/lib/semmle/python/pointsto/Final.qll
index b02c42852a1..ed7c6a436d5 100644
--- a/python/ql/lib/semmle/python/pointsto/Final.qll
+++ b/python/ql/lib/semmle/python/pointsto/Final.qll
@@ -1,5 +1,2 @@
 /* For backwards compatibility */
 import PointsTo::PointsTo as P
-
-/** DEPRECATED: Use `PointsTo` instead */
-deprecated module FinalPointsTo = P;
diff --git a/python/ql/lib/semmle/python/pointsto/MRO.qll b/python/ql/lib/semmle/python/pointsto/MRO.qll
index dd3517275f6..b1ea92b8c24 100644
--- a/python/ql/lib/semmle/python/pointsto/MRO.qll
+++ b/python/ql/lib/semmle/python/pointsto/MRO.qll
@@ -329,7 +329,7 @@ private class ClassListList extends TClassListList {
       result = ConsList(removed_head, removed_tail)
     )
     or
-    this = EmptyList() and result = EmptyList()
+    this = EmptyList() and result = EmptyList() and exists(cls)
   }
 
   pragma[nomagic]
diff --git a/python/ql/lib/semmle/python/pointsto/PointsTo.qll b/python/ql/lib/semmle/python/pointsto/PointsTo.qll
index 06617b08212..f1fc53a413b 100644
--- a/python/ql/lib/semmle/python/pointsto/PointsTo.qll
+++ b/python/ql/lib/semmle/python/pointsto/PointsTo.qll
@@ -8,7 +8,7 @@ private import semmle.python.types.Builtins
 private import semmle.python.types.Extensions
 
 /* Use this version for speed */
-library class CfgOrigin extends @py_object {
+class CfgOrigin extends @py_object {
   /** Gets a textual representation of this element. */
   string toString() {
     /* Not to be displayed */
@@ -145,24 +145,6 @@ module PointsTo {
     )
   }
 
-  deprecated predicate ssa_variable_points_to(
-    EssaVariable var, PointsToContext context, Object obj, ClassObject cls, CfgOrigin origin
-  ) {
-    exists(ObjectInternal value |
-      PointsToInternal::variablePointsTo(var, context, value, origin) and
-      cls = value.getClass().getSource()
-    |
-      obj = value.getSource()
-    )
-  }
-
-  deprecated CallNode get_a_call(Object func, PointsToContext context) {
-    exists(ObjectInternal value |
-      result = value.(Value).getACall(context) and
-      func = value.getSource()
-    )
-  }
-
   cached
   predicate moduleExports(ModuleObjectInternal mod, string name) {
     InterModulePointsTo::moduleExportsBoolean(mod, name) = true
@@ -1076,7 +1058,7 @@ module InterProceduralPointsTo {
   /** Helper for default_parameter_points_to */
   pragma[noinline]
   private predicate context_for_default_value(ParameterDefinition def, PointsToContext context) {
-    context.isRuntime()
+    context.isRuntime() and exists(def)
     or
     exists(PointsToContext caller, CallNode call, PythonFunctionObjectInternal func, int n |
       context.fromCall(call, func, caller) and
@@ -2286,7 +2268,7 @@ module Types {
       func != six_add_metaclass_function() and result = false
     )
     or
-    not exists(Module m | m.getName() = "six") and result = false
+    not exists(Module m | m.getName() = "six") and result = false and exists(cls)
     or
     exists(Class pycls |
       pycls = cls.getScope() and
@@ -2413,7 +2395,7 @@ module Types {
     )
   }
 
-  /* Holds if type inference failed to compute the full class hierarchy for this class for the reason given. */
+  /** Holds if type inference failed to compute the full class hierarchy for this class for the reason given. */
   private predicate failedInference(ClassObjectInternal cls, string reason, int priority) {
     strictcount(cls.(PythonClassObjectInternal).getScope().getADecorator()) > 1 and
     reason = "Multiple decorators" and
diff --git a/python/ql/lib/semmle/python/pointsto/PointsToContext.qll b/python/ql/lib/semmle/python/pointsto/PointsToContext.qll
index e85761e3916..0e5f52b01b8 100644
--- a/python/ql/lib/semmle/python/pointsto/PointsToContext.qll
+++ b/python/ql/lib/semmle/python/pointsto/PointsToContext.qll
@@ -126,7 +126,7 @@ module Context {
 }
 
 /**
- * Points-to context. Context can be one of:
+ * A points-to context. Context can be one of:
  *    * "main": Used for scripts.
  *    * "import": Use for non-script modules.
  *    * "default": Use for functions and methods without caller context.
diff --git a/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll b/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll
index 51e294c4f61..e22c00ddc47 100644
--- a/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll
+++ b/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll
@@ -176,8 +176,8 @@ private module RegexpMatching {
 }
 
 /** A class to test whether a regular expression matches certain HTML tags. */
-class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
-  HTMLMatchingRegExp() {
+class HtmlMatchingRegExp extends RegexpMatching::MatchedRegExp {
+  HtmlMatchingRegExp() {
     // the regexp must mention "<" and ">" explicitly.
     forall(string angleBracket | angleBracket = ["<", ">"] |
       any(RegExpConstant term | term.getValue().matches("%" + angleBracket + "%")).getRootTerm() =
@@ -204,12 +204,15 @@ class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
   }
 }
 
+/** DEPRECATED: Alias for HtmlMatchingRegExp */
+deprecated class HTMLMatchingRegExp = HtmlMatchingRegExp;
+
 /**
  * Holds if `regexp` matches some HTML tags, but misses some HTML tags that it should match.
  *
  * When adding a new case to this predicate, make sure the test string used in `matches(..)` calls are present in `HTMLMatchingRegExp::test` / `HTMLMatchingRegExp::testWithGroups`.
  */
-predicate isBadRegexpFilter(HTMLMatchingRegExp regexp, string msg) {
+predicate isBadRegexpFilter(HtmlMatchingRegExp regexp, string msg) {
   // CVE-2021-33829 - matching both "<!-- foo -->" and "<!-- foo --!>", but in different capture groups
   regexp.matches("<!-- foo -->") and
   regexp.matches("<!-- foo --!>") and
diff --git a/python/ql/lib/semmle/python/security/dataflow/PathInjection.qll b/python/ql/lib/semmle/python/security/dataflow/PathInjection.qll
index 923a53ad5d2..be6a37bbc23 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PathInjection.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PathInjection.qll
@@ -47,7 +47,7 @@ module PathInjection {
 
     override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
 
-    override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    override predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) {
       // Block `NotNormalized` paths here, since they change state to `NormalizedUnchecked`
       node instanceof Path::PathNormalization and
       state instanceof NotNormalized
@@ -60,7 +60,7 @@ module PathInjection {
       guard instanceof SanitizerGuard
     }
 
-    override predicate isAdditionalFlowStep(
+    override predicate isAdditionalTaintStep(
       DataFlow::Node nodeFrom, DataFlow::FlowState stateFrom, DataFlow::Node nodeTo,
       DataFlow::FlowState stateTo
     ) {
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll
index d5a937b8ef4..2d6624493e8 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll
@@ -13,8 +13,8 @@ import semmle.python.dataflow.new.TaintTracking
 /**
  * Provides a taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
  */
-module ReflectedXSS {
-  import ReflectedXSSCustomizations::ReflectedXSS
+module ReflectedXss {
+  import ReflectedXSSCustomizations::ReflectedXss
 
   /**
    * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
@@ -34,9 +34,12 @@ module ReflectedXSS {
   }
 }
 
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
+
 /**
  * DEPRECATED: Don't extend this class for customization, since this will lead to bad
  * performance, instead use the new `ReflectedXSSCustomizations.qll` file, and extend
  * its' classes.
  */
-deprecated class ReflectedXssConfiguration = ReflectedXSS::Configuration;
+deprecated class ReflectedXssConfiguration = ReflectedXss::Configuration;
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
index 93363d3409a..7208e26f422 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
@@ -15,7 +15,7 @@ private import semmle.python.dataflow.new.BarrierGuards
  * "reflected server-side cross-site scripting"
  * vulnerabilities, as well as extension points for adding your own.
  */
-module ReflectedXSS {
+module ReflectedXss {
   /**
    * A data flow source for "reflected server-side cross-site scripting" vulnerabilities.
    */
@@ -74,3 +74,6 @@ module ReflectedXSS {
    */
   class StringConstCompareAsSanitizerGuard extends SanitizerGuard, StringConstCompare { }
 }
+
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll
index 2bced608df3..9f7cd02413b 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll
@@ -39,4 +39,7 @@ module SqlInjection {
  * performance, instead use the new `SqlInjectionCustomizations.qll` file, and extend
  * its' classes.
  */
-deprecated class SQLInjectionConfiguration = SqlInjection::Configuration;
+deprecated class SqlInjectionConfiguration = SqlInjection::Configuration;
+
+/** DEPRECATED: Alias for SqlInjectionConfiguration */
+deprecated class SQLInjectionConfiguration = SqlInjectionConfiguration;
diff --git a/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll b/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll
index 824eb9de7ae..91b2d1d0378 100644
--- a/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll
+++ b/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll
@@ -119,18 +119,18 @@ class EmptyPositiveSubPatttern extends RegExpSubPattern {
  * whose root node is not a disjunction.
  */
 class RegExpRoot extends RegExpTerm {
-  RegExpParent parent;
-
   RegExpRoot() {
-    exists(RegExpAlt alt |
-      alt.isRootTerm() and
-      this = alt.getAChild() and
-      parent = alt.getParent()
+    exists(RegExpParent parent |
+      exists(RegExpAlt alt |
+        alt.isRootTerm() and
+        this = alt.getAChild() and
+        parent = alt.getParent()
+      )
+      or
+      this.isRootTerm() and
+      not this instanceof RegExpAlt and
+      parent = this.getParent()
     )
-    or
-    this.isRootTerm() and
-    not this instanceof RegExpAlt and
-    parent = this.getParent()
   }
 
   /**
@@ -466,13 +466,14 @@ private module CharacterClasses {
    * An implementation of `CharacterClass` for \d, \s, and \w.
    */
   private class PositiveCharacterClassEscape extends CharacterClass {
-    RegExpTerm cc;
     string charClass;
 
     PositiveCharacterClassEscape() {
-      isEscapeClass(cc, charClass) and
-      this = getCanonicalCharClass(cc) and
-      charClass = ["d", "s", "w"]
+      exists(RegExpTerm cc |
+        isEscapeClass(cc, charClass) and
+        this = getCanonicalCharClass(cc) and
+        charClass = ["d", "s", "w"]
+      )
     }
 
     override string getARelevantChar() {
@@ -504,13 +505,14 @@ private module CharacterClasses {
    * An implementation of `CharacterClass` for \D, \S, and \W.
    */
   private class NegativeCharacterClassEscape extends CharacterClass {
-    RegExpTerm cc;
     string charClass;
 
     NegativeCharacterClassEscape() {
-      isEscapeClass(cc, charClass) and
-      this = getCanonicalCharClass(cc) and
-      charClass = ["D", "S", "W"]
+      exists(RegExpTerm cc |
+        isEscapeClass(cc, charClass) and
+        this = getCanonicalCharClass(cc) and
+        charClass = ["D", "S", "W"]
+      )
     }
 
     override string getARelevantChar() {
diff --git a/python/ql/lib/semmle/python/security/strings/Basic.qll b/python/ql/lib/semmle/python/security/strings/Basic.qll
index f43a3db906c..6bbae862c32 100755
--- a/python/ql/lib/semmle/python/security/strings/Basic.qll
+++ b/python/ql/lib/semmle/python/security/strings/Basic.qll
@@ -45,7 +45,7 @@ abstract deprecated class StringKind extends TaintKind {
 deprecated private class StringEqualitySanitizer extends Sanitizer {
   StringEqualitySanitizer() { this = "string equality sanitizer" }
 
-  /** The test `if untrusted == "KNOWN_VALUE":` sanitizes `untrusted` on its `true` edge. */
+  /* The test `if untrusted == "KNOWN_VALUE":` sanitizes `untrusted` on its `true` edge. */
   override predicate sanitizingEdge(TaintKind taint, PyEdgeRefinement test) {
     taint instanceof StringKind and
     exists(ControlFlowNode const, Cmpop op | const.getNode() instanceof StrConst |
diff --git a/python/ql/lib/semmle/python/security/strings/Common.qll b/python/ql/lib/semmle/python/security/strings/Common.qll
index e7e542ec023..cb19fdd5461 100644
--- a/python/ql/lib/semmle/python/security/strings/Common.qll
+++ b/python/ql/lib/semmle/python/security/strings/Common.qll
@@ -1,6 +1,6 @@
 import python
 
-/* A call that returns a copy (or similar) of the argument */
+/** A call that returns a copy (or similar) of the argument */
 deprecated predicate copy_call(ControlFlowNode fromnode, CallNode tonode) {
   tonode.getFunction().(AttrNode).getObject("copy") = fromnode
   or
diff --git a/python/ql/lib/semmle/python/security/strings/External.qll b/python/ql/lib/semmle/python/security/strings/External.qll
index a2f3c40b407..48b61666143 100644
--- a/python/ql/lib/semmle/python/security/strings/External.qll
+++ b/python/ql/lib/semmle/python/security/strings/External.qll
@@ -79,18 +79,12 @@ deprecated class ExternalUrlSplitResult extends ExternalStringSequenceKind {
   override TaintKind getTaintOfAttribute(string name) {
     result = super.getTaintOfAttribute(name)
     or
-    (
-      // namedtuple field names
-      name = "scheme" or
-      name = "netloc" or
-      name = "path" or
-      name = "query" or
-      name = "fragment" or
-      // class methods
-      name = "username" or
-      name = "password" or
-      name = "hostname"
-    ) and
+    name in [
+        // namedtuple field names
+        "scheme", "netloc", "path", "query", "fragment",
+        // class methods
+        "password", "username", "hostname",
+      ] and
     result instanceof ExternalStringKind
   }
 
@@ -108,19 +102,12 @@ deprecated class ExternalUrlParseResult extends ExternalStringSequenceKind {
   override TaintKind getTaintOfAttribute(string name) {
     result = super.getTaintOfAttribute(name)
     or
-    (
-      // namedtuple field names
-      name = "scheme" or
-      name = "netloc" or
-      name = "path" or
-      name = "params" or
-      name = "query" or
-      name = "fragment" or
-      // class methods
-      name = "username" or
-      name = "password" or
-      name = "hostname"
-    ) and
+    name in [
+        // namedtuple field names
+        "scheme", "netloc", "path", "params", "query", "fragment",
+        // class methods
+        "username", "password", "hostname",
+      ] and
     result instanceof ExternalStringKind
   }
 
diff --git a/python/ql/lib/semmle/python/strings.qll b/python/ql/lib/semmle/python/strings.qll
index 6c4b3ded1ce..c8a134736d3 100644
--- a/python/ql/lib/semmle/python/strings.qll
+++ b/python/ql/lib/semmle/python/strings.qll
@@ -18,9 +18,9 @@ predicate mapping_format(StrConst e) {
  */
 
 private string conversion_specifier_string(StrConst e, int number, int position) {
-  exists(string s, string REGEX | s = e.getText() |
-    REGEX = "%(\\([^)]*\\))?[#0\\- +]*(\\*|[0-9]*)(\\.(\\*|[0-9]*))?(h|H|l|L)?[badiouxXeEfFgGcrs%]" and
-    result = s.regexpFind(REGEX, number, position)
+  exists(string s, string regex | s = e.getText() |
+    regex = "%(\\([^)]*\\))?[#0\\- +]*(\\*|[0-9]*)(\\.(\\*|[0-9]*))?(h|H|l|L)?[badiouxXeEfFgGcrs%]" and
+    result = s.regexpFind(regex, number, position)
   )
 }
 
diff --git a/python/ql/lib/semmle/python/templates/PyxlTags.qll b/python/ql/lib/semmle/python/templates/PyxlTags.qll
index abfef070d78..2cce8cbc59d 100644
--- a/python/ql/lib/semmle/python/templates/PyxlTags.qll
+++ b/python/ql/lib/semmle/python/templates/PyxlTags.qll
@@ -57,7 +57,7 @@ class PyxlEndIfTag extends PyxlTag {
 class PyxlRawHtml extends PyxlTag {
   PyxlRawHtml() { this.getPyxlTagName() = "rawhtml" }
 
-  /** The text for this raw html, if it is simple text. */
+  /** Gets the text for this raw html, if it is simple text. */
   string getText() {
     exists(Unicode text |
       text = this.getValue() and
diff --git a/python/ql/lib/semmle/python/types/ClassObject.qll b/python/ql/lib/semmle/python/types/ClassObject.qll
index 726f8b3c5c8..e3ad51ea162 100644
--- a/python/ql/lib/semmle/python/types/ClassObject.qll
+++ b/python/ql/lib/semmle/python/types/ClassObject.qll
@@ -63,13 +63,13 @@ class ClassObject extends Object {
   ClassObject getAnImproperSuperType() { result = this.getABaseType*() }
 
   /**
-   * Whether this class is a new style class.
+   * Holds if this class is a new style class.
    * A new style class is one that implicitly or explicitly inherits from `object`.
    */
   predicate isNewStyle() { Types::isNewStyle(this.theClass()) }
 
   /**
-   * Whether this class is an old style class.
+   * Holds if this class is an old style class.
    * An old style class is one that does not inherit from `object`.
    */
   predicate isOldStyle() { Types::isOldStyle(this.theClass()) }
@@ -166,7 +166,7 @@ class ClassObject extends Object {
     not this.failedInference()
   }
 
-  /* Whether this class is abstract. */
+  /** Holds if this class is abstract. */
   predicate isAbstract() {
     this.getMetaClass() = theAbcMetaClassObject()
     or
@@ -357,7 +357,7 @@ class ClassObject extends Object {
 }
 
 /**
- * The 'str' class. This is the same as the 'bytes' class for
+ * Gets the 'str' class. This is the same as the 'bytes' class for
  * Python 2 and the 'unicode' class for Python 3
  */
 ClassObject theStrType() {
@@ -375,128 +375,128 @@ ClassObject theAbcMetaClassObject() {
 }
 
 /* Common builtin classes */
-/** The built-in class NoneType */
+/** Gets the built-in class NoneType */
 ClassObject theNoneType() { result.asBuiltin() = Builtin::special("NoneType") }
 
-/** The built-in class 'bool' */
+/** Gets the built-in class 'bool' */
 ClassObject theBoolType() { result.asBuiltin() = Builtin::special("bool") }
 
-/** The builtin class 'type' */
+/** Gets the builtin class 'type' */
 ClassObject theTypeType() { result.asBuiltin() = Builtin::special("type") }
 
-/** The builtin object ClassType (for old-style classes) */
+/** Gets the builtin object ClassType (for old-style classes) */
 ClassObject theClassType() { result.asBuiltin() = Builtin::special("ClassType") }
 
-/** The builtin object InstanceType (for old-style classes) */
+/** Gets the builtin object InstanceType (for old-style classes) */
 ClassObject theInstanceType() { result.asBuiltin() = Builtin::special("InstanceType") }
 
-/** The builtin class 'tuple' */
+/** Gets the builtin class 'tuple' */
 ClassObject theTupleType() { result.asBuiltin() = Builtin::special("tuple") }
 
-/** The builtin class 'int' */
+/** Gets the builtin class 'int' */
 ClassObject theIntType() { result.asBuiltin() = Builtin::special("int") }
 
-/** The builtin class 'long' (Python 2 only) */
+/** Gets the builtin class 'long' (Python 2 only) */
 ClassObject theLongType() { result.asBuiltin() = Builtin::special("long") }
 
-/** The builtin class 'float' */
+/** Gets the builtin class 'float' */
 ClassObject theFloatType() { result.asBuiltin() = Builtin::special("float") }
 
-/** The builtin class 'complex' */
+/** Gets the builtin class 'complex' */
 ClassObject theComplexType() { result.asBuiltin() = Builtin::special("complex") }
 
-/** The builtin class 'object' */
+/** Gets the builtin class 'object' */
 ClassObject theObjectType() { result.asBuiltin() = Builtin::special("object") }
 
-/** The builtin class 'list' */
+/** Gets the builtin class 'list' */
 ClassObject theListType() { result.asBuiltin() = Builtin::special("list") }
 
-/** The builtin class 'dict' */
+/** Gets the builtin class 'dict' */
 ClassObject theDictType() { result.asBuiltin() = Builtin::special("dict") }
 
-/** The builtin class 'Exception' */
+/** Gets the builtin class 'Exception' */
 ClassObject theExceptionType() { result.asBuiltin() = Builtin::special("Exception") }
 
-/** The builtin class for unicode. unicode in Python2, str in Python3 */
+/** Gets the builtin class for unicode. unicode in Python2, str in Python3 */
 ClassObject theUnicodeType() { result.asBuiltin() = Builtin::special("unicode") }
 
-/** The builtin class '(x)range' */
+/** Gets the builtin class '(x)range' */
 ClassObject theRangeType() {
   result = Object::builtin("xrange")
   or
   major_version() = 3 and result = Object::builtin("range")
 }
 
-/** The builtin class for bytes. str in Python2, bytes in Python3 */
+/** Gets the builtin class for bytes. str in Python2, bytes in Python3 */
 ClassObject theBytesType() { result.asBuiltin() = Builtin::special("bytes") }
 
-/** The builtin class 'set' */
+/** Gets the builtin class 'set' */
 ClassObject theSetType() { result.asBuiltin() = Builtin::special("set") }
 
-/** The builtin class 'property' */
+/** Gets the builtin class 'property' */
 ClassObject thePropertyType() { result.asBuiltin() = Builtin::special("property") }
 
-/** The builtin class 'BaseException' */
+/** Gets the builtin class 'BaseException' */
 ClassObject theBaseExceptionType() { result.asBuiltin() = Builtin::special("BaseException") }
 
-/** The class of builtin-functions */
+/** Gets the class of builtin-functions */
 ClassObject theBuiltinFunctionType() {
   result.asBuiltin() = Builtin::special("BuiltinFunctionType")
 }
 
-/** The class of Python functions */
+/** Gets the class of Python functions */
 ClassObject thePyFunctionType() { result.asBuiltin() = Builtin::special("FunctionType") }
 
-/** The builtin class 'classmethod' */
+/** Gets the builtin class 'classmethod' */
 ClassObject theClassMethodType() { result.asBuiltin() = Builtin::special("ClassMethod") }
 
-/** The builtin class 'staticmethod' */
+/** Gets the builtin class 'staticmethod' */
 ClassObject theStaticMethodType() { result.asBuiltin() = Builtin::special("StaticMethod") }
 
-/** The class of modules */
+/** Gets the class of modules */
 ClassObject theModuleType() { result.asBuiltin() = Builtin::special("ModuleType") }
 
-/** The class of generators */
+/** Gets the class of generators */
 ClassObject theGeneratorType() { result.asBuiltin() = Builtin::special("generator") }
 
-/** The builtin class 'TypeError' */
+/** Gets the builtin class 'TypeError' */
 ClassObject theTypeErrorType() { result.asBuiltin() = Builtin::special("TypeError") }
 
-/** The builtin class 'AttributeError' */
+/** Gets the builtin class 'AttributeError' */
 ClassObject theAttributeErrorType() { result.asBuiltin() = Builtin::special("AttributeError") }
 
-/** The builtin class 'KeyError' */
+/** Gets the builtin class 'KeyError' */
 ClassObject theKeyErrorType() { result.asBuiltin() = Builtin::special("KeyError") }
 
-/** The builtin class of bound methods */
+/** Gets the builtin class of bound methods */
 pragma[noinline]
 ClassObject theBoundMethodType() { result.asBuiltin() = Builtin::special("MethodType") }
 
-/** The builtin class of builtin properties */
+/** Gets the builtin class of builtin properties */
 ClassObject theGetSetDescriptorType() {
   result.asBuiltin() = Builtin::special("GetSetDescriptorType")
 }
 
-/** The method descriptor class */
+/** Gets the method descriptor class */
 ClassObject theMethodDescriptorType() {
   result.asBuiltin() = Builtin::special("MethodDescriptorType")
 }
 
-/** The class of builtin properties */
+/** Gets the class of builtin properties */
 ClassObject theBuiltinPropertyType() {
   /* This is CPython specific */
   result.isC() and
   result.getName() = "getset_descriptor"
 }
 
-/** The builtin class 'IOError' */
+/** Gets the builtin class 'IOError' */
 ClassObject theIOErrorType() { result = Object::builtin("IOError") }
 
-/** The builtin class 'super' */
+/** Gets the builtin class 'super' */
 ClassObject theSuperType() { result = Object::builtin("super") }
 
-/** The builtin class 'StopIteration' */
+/** Gets the builtin class 'StopIteration' */
 ClassObject theStopIterationType() { result = Object::builtin("StopIteration") }
 
-/** The builtin class 'NotImplementedError' */
+/** Gets the builtin class 'NotImplementedError' */
 ClassObject theNotImplementedErrorType() { result = Object::builtin("NotImplementedError") }
diff --git a/python/ql/lib/semmle/python/types/Exceptions.qll b/python/ql/lib/semmle/python/types/Exceptions.qll
index 65fca62c93c..9a6dbda2597 100644
--- a/python/ql/lib/semmle/python/types/Exceptions.qll
+++ b/python/ql/lib/semmle/python/types/Exceptions.qll
@@ -13,7 +13,7 @@
 
 import python
 
-/** Subset of ControlFlowNodes which might raise an exception */
+/** The subset of ControlFlowNodes which might raise an exception */
 class RaisingNode extends ControlFlowNode {
   RaisingNode() {
     exists(this.getAnExceptionalSuccessor())
@@ -363,7 +363,7 @@ predicate scope_raises_unknown(Scope s) {
   )
 }
 
-/** ControlFlowNode for an 'except' statement. */
+/** The ControlFlowNode for an 'except' statement. */
 class ExceptFlowNode extends ControlFlowNode {
   ExceptFlowNode() { this.getNode() instanceof ExceptStmt }
 
diff --git a/python/ql/lib/semmle/python/types/Extensions.qll b/python/ql/lib/semmle/python/types/Extensions.qll
index 97846c721a9..8b5b357723f 100644
--- a/python/ql/lib/semmle/python/types/Extensions.qll
+++ b/python/ql/lib/semmle/python/types/Extensions.qll
@@ -30,42 +30,8 @@ abstract class PointsToExtension extends @py_flow_node {
  * sources of data to the points-to analysis.
  */
 
-/** DEPRECATED -- Use PointsToExtension instead */
-abstract deprecated class CustomPointsToFact extends @py_flow_node {
-  string toString() { result = "CustomPointsToFact with missing toString" }
-
-  abstract predicate pointsTo(Context context, Object value, ClassObject cls, ControlFlowNode origin);
-}
-
-/** DEPRECATED -- Use PointsToExtension instead */
-deprecated class FinalCustomPointsToFact = CustomPointsToFact;
-
-abstract deprecated class CustomPointsToOriginFact extends CustomPointsToFact {
-  abstract predicate pointsTo(Object value, ClassObject cls);
-
-  override predicate pointsTo(Context context, Object value, ClassObject cls, ControlFlowNode origin) {
-    this.pointsTo(value, cls) and origin = this and context.appliesTo(this)
-  }
-}
-
-/* Custom points-to fact with inferred class */
-abstract deprecated class CustomPointsToObjectFact extends CustomPointsToFact {
-  abstract predicate pointsTo(Object value);
-
-  override predicate pointsTo(Context context, Object value, ClassObject cls, ControlFlowNode origin) {
-    this.pointsTo(value) and cls = simple_types(value) and origin = this and context.appliesTo(this)
-  }
-}
-
-/** DEPRECATED -- Unsupported; do not use */
-abstract deprecated class CustomPointsToAttribute extends Object {
-  abstract predicate attributePointsTo(
-    string name, Object value, ClassObject cls, ControlFlowNode origin
-  );
-}
-
 /* An example */
-/** Any variable iterating over range or xrange must be an integer */
+/** An extension representing the fact that a variable iterating over range or xrange must be an integer */
 class RangeIterationVariableFact extends PointsToExtension {
   RangeIterationVariableFact() {
     exists(For f, ControlFlowNode iterable |
@@ -143,40 +109,3 @@ class ReModulePointToExtension extends PointsToExtension {
   pragma[noinline]
   private predicate pointsTo_helper(Context context) { context.appliesTo(this) }
 }
-
-deprecated private class BackwardCompatiblePointToExtension extends PointsToExtension instanceof CustomPointsToFact {
-  override predicate pointsTo(Context context, ObjectInternal value, ControlFlowNode origin) {
-    exists(Object obj, ClassObject cls |
-      CustomPointsToFact.super.pointsTo(context, obj, cls, origin)
-    |
-      value.getBuiltin() = obj
-      or
-      obj instanceof ControlFlowNode and
-      exists(ClassObjectInternal c |
-        c.getSource() = cls and
-        value = TUnknownInstance(c)
-      )
-    )
-    or
-    exists(ObjectInternal owner, string name |
-      PointsTo::pointsTo(this.(AttrNode).getObject(name), context, owner, _) and
-      additionalAttribute(owner, name, value, origin)
-    )
-  }
-}
-
-deprecated private predicate additionalAttribute(
-  ObjectInternal owner, string name, ObjectInternal value, ControlFlowNode origin
-) {
-  exists(Object obj, ClassObject cls |
-    owner.getSource().(CustomPointsToAttribute).attributePointsTo(name, obj, cls, origin)
-  |
-    value.getBuiltin() = obj
-    or
-    obj instanceof ControlFlowNode and
-    exists(ClassObjectInternal c |
-      c.getSource() = cls and
-      value = TUnknownInstance(c)
-    )
-  )
-}
diff --git a/python/ql/lib/semmle/python/types/FunctionObject.qll b/python/ql/lib/semmle/python/types/FunctionObject.qll
index 074d9bc2327..ec05ba6a3c1 100644
--- a/python/ql/lib/semmle/python/types/FunctionObject.qll
+++ b/python/ql/lib/semmle/python/types/FunctionObject.qll
@@ -29,9 +29,6 @@ abstract class FunctionObject extends Object {
   /** Whether this function raises an exception, the class of which cannot be inferred */
   abstract predicate raisesUnknownType();
 
-  /** Use descriptiveString() instead. */
-  deprecated string prettyString() { result = this.descriptiveString() }
-
   /** Gets a longer, more descriptive version of toString() */
   abstract string descriptiveString();
 
@@ -311,33 +308,3 @@ class BuiltinFunctionObject extends BuiltinCallable {
 
   override int maxParameters() { none() }
 }
-
-/** DEPRECATED -- Use `Object::builtin("apply")` instead. */
-deprecated Object theApplyFunction() { result = Object::builtin("apply") }
-
-/** DEPRECATED -- Use `Object::builtin("hasattr")` instead. */
-deprecated Object theHasattrFunction() { result = Object::builtin("hasattr") }
-
-/** DEPRECATED -- Use `Object::builtin("len")` instead. */
-deprecated Object theLenFunction() { result = Object::builtin("len") }
-
-/** DEPRECATED -- Use `Object::builtin("format")` instead. */
-deprecated Object theFormatFunction() { result = Object::builtin("format") }
-
-/** DEPRECATED -- Use `Object::builtin("open")` instead. */
-deprecated Object theOpenFunction() { result = Object::builtin("open") }
-
-/** DEPRECATED -- Use `Object::builtin("print")` instead. */
-deprecated Object thePrintFunction() { result = Object::builtin("print") }
-
-/** DEPRECATED -- Use `Object::builtin("input")` instead. */
-deprecated Object theInputFunction() { result = Object::builtin("input") }
-
-/** DEPRECATED -- Use `Object::builtin("locals")` instead. */
-deprecated Object theLocalsFunction() { result = Object::builtin("locals") }
-
-/** DEPRECATED -- Use `Object::builtin("globals")()` instead. */
-deprecated Object theGlobalsFunction() { result = Object::builtin("globals") }
-
-/** DEPRECATED -- Use `Object::builtin("sysExit()` instead. */
-deprecated Object theExitFunctionObject() { result = ModuleObject::named("sys").attr("exit") }
diff --git a/python/ql/lib/semmle/python/types/ModuleObject.qll b/python/ql/lib/semmle/python/types/ModuleObject.qll
index 8e6c6656f15..2e6d3863801 100644
--- a/python/ql/lib/semmle/python/types/ModuleObject.qll
+++ b/python/ql/lib/semmle/python/types/ModuleObject.qll
@@ -74,13 +74,6 @@ abstract class ModuleObject extends Object {
    */
   predicate exports(string name) { this.theModule().exports(name) }
 
-  /**
-   * Whether the complete set of names "exported" by this module can be accurately determined
-   *
-   * DEPRECATED: Use ModuleValue::hasCompleteExportInfo instead
-   */
-  abstract deprecated predicate exportsComplete();
-
   /** Gets the short name of the module. For example the short name of module x.y.z is 'z' */
   string getShortName() {
     result = this.getName().suffix(this.getPackage().getName().length() + 1)
@@ -117,8 +110,6 @@ class BuiltinModuleObject extends ModuleObject {
   }
 
   override predicate hasAttribute(string name) { exists(this.asBuiltin().getMember(name)) }
-
-  deprecated override predicate exportsComplete() { any() }
 }
 
 class PythonModuleObject extends ModuleObject {
@@ -131,18 +122,6 @@ class PythonModuleObject extends ModuleObject {
   override Module getSourceModule() { result = this.getOrigin() }
 
   override Container getPath() { result = this.getModule().getFile() }
-
-  deprecated override predicate exportsComplete() {
-    exists(Module m | m = this.getModule() |
-      not exists(Call modify, Attribute attr, GlobalVariable all |
-        modify.getScope() = m and
-        modify.getFunc() = attr and
-        all.getId() = "__all__"
-      |
-        attr.getObject().(Name).uses(all)
-      )
-    )
-  }
 }
 
 /**
@@ -196,12 +175,6 @@ class PackageObject extends ModuleObject {
     )
   }
 
-  deprecated override predicate exportsComplete() {
-    not exists(this.getInitModule())
-    or
-    this.getInitModule().exportsComplete()
-  }
-
   override predicate hasAttribute(string name) {
     exists(this.submodule(name))
     or
@@ -211,7 +184,7 @@ class PackageObject extends ModuleObject {
   Location getLocation() { none() }
 
   override predicate hasLocationInfo(string path, int bl, int bc, int el, int ec) {
-    path = this.getPath().getName() and
+    path = this.getPath().getAbsolutePath() and
     bl = 0 and
     bc = 0 and
     el = 0 and
diff --git a/python/ql/lib/semmle/python/types/Object.qll b/python/ql/lib/semmle/python/types/Object.qll
index 853add90f6d..2890f27b999 100644
--- a/python/ql/lib/semmle/python/types/Object.qll
+++ b/python/ql/lib/semmle/python/types/Object.qll
@@ -14,6 +14,8 @@ private predicate is_an_object(@py_object obj) {
 }
 
 /**
+ * An object.
+ *
  * Instances of this class represent objects in the Python program. However, since
  *  the QL database is static and Python programs are dynamic, there are necessarily a
  *  number of approximations.
@@ -138,7 +140,7 @@ class Object extends @py_object {
   }
 
   /**
-   * The Boolean value of this object if it always evaluates to true or false.
+   * Gets the Boolean value of this object if it always evaluates to true or false.
    * For example:
    *     false for None, true for 7 and no result for int(x)
    */
@@ -217,7 +219,7 @@ private Object findByName3(string longName) {
 }
 
 /**
- * Numeric objects (ints and floats).
+ * A numeric object (int or float).
  * Includes those occurring in the source as a literal
  * or in a builtin module as a value.
  */
@@ -269,7 +271,7 @@ class NumericObject extends Object {
 }
 
 /**
- * String objects (unicode or bytes).
+ * A string object (unicode or bytes).
  * Includes those occurring in the source as a literal
  * or in a builtin module as a value.
  */
@@ -299,7 +301,7 @@ class StringObject extends Object {
 }
 
 /**
- * Sequence objects (lists and tuples)
+ * A sequence object (list or tuple)
  *  Includes those occurring in the source as a literal
  *  or in a builtin module as a value.
  */
@@ -358,55 +360,43 @@ class ListObject extends SequenceObject {
   }
 }
 
-/** The `builtin` module */
+/** Gets the `builtin` module */
 BuiltinModuleObject theBuiltinModuleObject() { result.asBuiltin() = Builtin::builtinModule() }
 
-/** The `sys` module */
+/** Gets the `sys` module */
 BuiltinModuleObject theSysModuleObject() { result.asBuiltin() = Builtin::special("sys") }
 
-/** DEPRECATED -- Use `Object::builtin(name)` instead. */
-deprecated Object builtin_object(string name) { result = Object::builtin(name) }
-
-/** The built-in object None */
+/** Gets the built-in object None */
 Object theNoneObject() { result.asBuiltin() = Builtin::special("None") }
 
-/** The built-in object True */
+/** Gets the built-in object True */
 Object theTrueObject() { result.asBuiltin() = Builtin::special("True") }
 
-/** The built-in object False */
+/** Gets the built-in object False */
 Object theFalseObject() { result.asBuiltin() = Builtin::special("False") }
 
-/** The NameError class */
+/** Gets the NameError class */
 Object theNameErrorType() { result = Object::builtin("NameError") }
 
-/** The StandardError class */
+/** Gets the StandardError class */
 Object theStandardErrorType() { result = Object::builtin("StandardError") }
 
-/** The IndexError class */
+/** Gets the IndexError class */
 Object theIndexErrorType() { result = Object::builtin("IndexError") }
 
-/** The LookupError class */
+/** Gets the LookupError class */
 Object theLookupErrorType() { result = Object::builtin("LookupError") }
 
-/** DEPRECATED -- Use `Object::quitter(name)` instead. */
-deprecated Object quitterObject(string name) { result = Object::quitter(name) }
-
-/** DEPRECATED -- Use `Object::notImplemented()` instead. */
-deprecated Object theNotImplementedObject() { result = Object::builtin("NotImplemented") }
-
-/** DEPRECATED -- Use `TupleObject::empty()` instead. */
-deprecated Object theEmptyTupleObject() { result = TupleObject::empty() }
-
 module Object {
   Object builtin(string name) { result.asBuiltin() = Builtin::builtin(name) }
 
-  /** The named quitter object (quit or exit) in the builtin namespace */
+  /** Gets the named quitter object (quit or exit) in the builtin namespace */
   Object quitter(string name) {
     (name = "quit" or name = "exit") and
     result = builtin(name)
   }
 
-  /** The builtin object `NotImplemented`. Not be confused with `NotImplementedError`. */
+  /** Gets the builtin object `NotImplemented`. Not be confused with `NotImplementedError`. */
   Object notImplemented() { result = builtin("NotImplemented") }
 }
 
diff --git a/python/ql/lib/semmle/python/web/bottle/General.qll b/python/ql/lib/semmle/python/web/bottle/General.qll
index 0472b3b4d1b..cbb42c97305 100644
--- a/python/ql/lib/semmle/python/web/bottle/General.qll
+++ b/python/ql/lib/semmle/python/web/bottle/General.qll
@@ -2,10 +2,10 @@ import python
 import semmle.python.web.Http
 import semmle.python.types.Extensions
 
-/** The bottle module */
+/** Gets the bottle module */
 deprecated ModuleValue theBottleModule() { result = Module::named("bottle") }
 
-/** The bottle.Bottle class */
+/** Gets the bottle.Bottle class */
 deprecated ClassValue theBottleClass() { result = theBottleModule().attr("Bottle") }
 
 /**
diff --git a/python/ql/lib/semmle/python/web/bottle/Redirect.qll b/python/ql/lib/semmle/python/web/bottle/Redirect.qll
index dddaa1f0abe..6525cc058eb 100644
--- a/python/ql/lib/semmle/python/web/bottle/Redirect.qll
+++ b/python/ql/lib/semmle/python/web/bottle/Redirect.qll
@@ -12,7 +12,7 @@ import semmle.python.web.bottle.General
 deprecated FunctionValue bottle_redirect() { result = theBottleModule().attr("redirect") }
 
 /**
- * Represents an argument to the `bottle.redirect` function.
+ * An argument to the `bottle.redirect` function.
  */
 deprecated class BottleRedirect extends TaintSink {
   override string toString() { result = "bottle.redirect" }
diff --git a/python/ql/lib/semmle/python/web/bottle/Request.qll b/python/ql/lib/semmle/python/web/bottle/Request.qll
index 552d121dba5..3de4748b30e 100644
--- a/python/ql/lib/semmle/python/web/bottle/Request.qll
+++ b/python/ql/lib/semmle/python/web/bottle/Request.qll
@@ -68,7 +68,7 @@ deprecated class UntrustedFile extends TaintKind {
 //   TO DO.. File uploads -- Should check about file uploads for other frameworks as well.
 //  Move UntrustedFile to shared location
 //
-/** Parameter to a bottle request handler function */
+/** A parameter to a bottle request handler function */
 deprecated class BottleRequestParameter extends HttpRequestTaintSource {
   BottleRequestParameter() {
     exists(BottleRoute route | route.getANamedArgument() = this.(ControlFlowNode).getNode())
diff --git a/python/ql/lib/semmle/python/web/django/Redirect.qll b/python/ql/lib/semmle/python/web/django/Redirect.qll
index 10d024bf9c2..0319f18190f 100644
--- a/python/ql/lib/semmle/python/web/django/Redirect.qll
+++ b/python/ql/lib/semmle/python/web/django/Redirect.qll
@@ -21,9 +21,6 @@ deprecated class DjangoShortcutsRedirectSink extends HttpRedirectTaintSink {
   }
 }
 
-/** DEPRECATED: Use `DjangoShortcutsRedirectSink` instead. */
-deprecated class DjangoRedirect = DjangoShortcutsRedirectSink;
-
 /**
  * The URL argument when instantiating a Django Redirect Response.
  */
diff --git a/python/ql/lib/semmle/python/web/django/Response.qll b/python/ql/lib/semmle/python/web/django/Response.qll
index bcf7b3d7223..3444884dd32 100644
--- a/python/ql/lib/semmle/python/web/django/Response.qll
+++ b/python/ql/lib/semmle/python/web/django/Response.qll
@@ -4,16 +4,6 @@ import semmle.python.security.strings.Basic
 private import semmle.python.web.django.Shared
 private import semmle.python.web.Http
 
-/**
- * DEPRECATED: This class is internal to the django library modeling, and should
- * never be used by anyone.
- *
- * A django.http.response.Response object
- * This isn't really a "taint", but we use the value tracking machinery to
- * track the flow of response objects.
- */
-deprecated class DjangoResponse = DjangoResponseKind;
-
 /** INTERNAL class used for tracking a django response object. */
 deprecated private class DjangoResponseKind extends TaintKind {
   DjangoResponseKind() { this = "django.response.HttpResponse" }
diff --git a/python/ql/lib/semmle/python/web/django/Shared.qll b/python/ql/lib/semmle/python/web/django/Shared.qll
index 6b85b54ff6d..bc156249d25 100644
--- a/python/ql/lib/semmle/python/web/django/Shared.qll
+++ b/python/ql/lib/semmle/python/web/django/Shared.qll
@@ -1,17 +1,5 @@
 import python
 
-/** DEPRECATED: Use `Value::named("django.shortcuts.redirect")` instead. */
-deprecated FunctionValue redirect() { result = Value::named("django.shortcuts.redirect") }
-
-/** DEPRECATED: Use `DjangoRedirectResponseClass` instead. */
-deprecated ClassValue theDjangoHttpRedirectClass() {
-  // version 1.x
-  result = Value::named("django.http.response.HttpResponseRedirectBase")
-  or
-  // version 2.x
-  result = Value::named("django.http.HttpResponseRedirectBase")
-}
-
 /** A class that is a Django Redirect Response (subclass of `django.http.HttpResponseRedirectBase`). */
 deprecated class DjangoRedirectResponseClass extends ClassValue {
   DjangoRedirectResponseClass() {
diff --git a/python/ql/lib/semmle/python/web/falcon/General.qll b/python/ql/lib/semmle/python/web/falcon/General.qll
index 13b64c2ad77..5f9cce57611 100644
--- a/python/ql/lib/semmle/python/web/falcon/General.qll
+++ b/python/ql/lib/semmle/python/web/falcon/General.qll
@@ -1,7 +1,7 @@
 import python
 import semmle.python.web.Http
 
-/** The falcon API class */
+/** Gets the falcon API class */
 deprecated ClassValue theFalconAPIClass() { result = Value::named("falcon.API") }
 
 /** Holds if `route` is routed to `resource` */
diff --git a/python/ql/lib/semmle/python/web/flask/General.qll b/python/ql/lib/semmle/python/web/flask/General.qll
index 60b9a7ee372..cc4d992f9ff 100644
--- a/python/ql/lib/semmle/python/web/flask/General.qll
+++ b/python/ql/lib/semmle/python/web/flask/General.qll
@@ -2,10 +2,10 @@ import python
 import semmle.python.web.Http
 import semmle.python.web.flask.Response
 
-/** The flask app class */
+/** Gets the flask app class */
 deprecated ClassValue theFlaskClass() { result = Value::named("flask.Flask") }
 
-/** The flask MethodView class */
+/** Gets the flask MethodView class */
 deprecated ClassValue theFlaskMethodViewClass() { result = Value::named("flask.views.MethodView") }
 
 deprecated ClassValue theFlaskReponseClass() { result = Value::named("flask.Response") }
diff --git a/python/ql/lib/semmle/python/web/stdlib/Request.qll b/python/ql/lib/semmle/python/web/stdlib/Request.qll
index fd95950168f..ff850233616 100644
--- a/python/ql/lib/semmle/python/web/stdlib/Request.qll
+++ b/python/ql/lib/semmle/python/web/stdlib/Request.qll
@@ -8,7 +8,7 @@ import python
 import semmle.python.dataflow.TaintTracking
 import semmle.python.web.Http
 
-/** Source of BaseHTTPRequestHandler instances. */
+/** Source of BaseHttpRequestHandler instances. */
 deprecated class StdLibRequestSource extends HttpRequestTaintSource {
   StdLibRequestSource() {
     exists(ClassValue cls |
@@ -23,7 +23,7 @@ deprecated class StdLibRequestSource extends HttpRequestTaintSource {
   override predicate isSourceOf(TaintKind kind) { kind instanceof BaseHTTPRequestHandlerKind }
 }
 
-/** TaintKind for an instance of BaseHTTPRequestHandler. */
+/** TaintKind for an instance of BaseHttpRequestHandler. */
 deprecated class BaseHTTPRequestHandlerKind extends TaintKind {
   BaseHTTPRequestHandlerKind() { this = "BaseHTTPRequestHandlerKind" }
 
@@ -39,7 +39,7 @@ deprecated class BaseHTTPRequestHandlerKind extends TaintKind {
   }
 }
 
-/** TaintKind for headers (instance of HTTPMessage). */
+/** TaintKind for headers (instance of HttpMessage). */
 deprecated class HTTPMessageKind extends ExternalStringDictKind {
   override TaintKind getTaintOfMethodResult(string name) {
     result = super.getTaintOfMethodResult(name)
diff --git a/python/ql/lib/semmle/python/web/stdlib/Response.qll b/python/ql/lib/semmle/python/web/stdlib/Response.qll
index 2b9407a47b7..651201e204d 100644
--- a/python/ql/lib/semmle/python/web/stdlib/Response.qll
+++ b/python/ql/lib/semmle/python/web/stdlib/Response.qll
@@ -18,7 +18,7 @@ deprecated private predicate is_wfile(AttrNode wfile) {
   )
 }
 
-/** Sink for `h.wfile.write` where `h` is an instance of BaseHTTPRequestHandler. */
+/** Sink for `h.wfile.write` where `h` is an instance of BaseHttpRequestHandler. */
 deprecated class StdLibWFileWriteSink extends HttpResponseTaintSink {
   StdLibWFileWriteSink() {
     exists(CallNode call |
@@ -30,7 +30,7 @@ deprecated class StdLibWFileWriteSink extends HttpResponseTaintSink {
   override predicate sinks(TaintKind kind) { kind instanceof ExternalStringKind }
 }
 
-/** Sink for `h.wfile.writelines` where `h` is an instance of BaseHTTPRequestHandler. */
+/** Sink for `h.wfile.writelines` where `h` is an instance of BaseHttpRequestHandler. */
 deprecated class StdLibWFileWritelinesSink extends HttpResponseTaintSink {
   StdLibWFileWritelinesSink() {
     exists(CallNode call |
diff --git a/python/ql/lib/semmle/python/xml/XML.qll b/python/ql/lib/semmle/python/xml/XML.qll
index dc76884b73c..fb781a4683f 100755
--- a/python/ql/lib/semmle/python/xml/XML.qll
+++ b/python/ql/lib/semmle/python/xml/XML.qll
@@ -4,21 +4,14 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
-  /**
-   * DEPRECATED: Use `getLocation()` instead.
-   *
-   * Gets the source location for this element.
-   */
-  deprecated Location getALocation() { result = this.getLocation() }
-
   /**
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
@@ -83,21 +76,6 @@ class XMLParent extends @xmlparent {
   /** Gets the number of places in the body of this XML parent where text occurs. */
   int getNumberOfCharacterSets() { result = count(int pos | xmlChars(_, _, this, pos, _, _)) }
 
-  /**
-   * DEPRECATED: Internal.
-   *
-   * Append the character sequences of this XML parent from left to right, separated by a space,
-   * up to a specified (zero-based) index.
-   */
-  deprecated string charsSetUpTo(int n) {
-    n = 0 and xmlChars(_, result, this, 0, _, _)
-    or
-    n > 0 and
-    exists(string chars | xmlChars(_, chars, this, n, _, _) |
-      result = this.charsSetUpTo(n - 1) + " " + chars
-    )
-  }
-
   /**
    * Gets the result of appending all the character sequences of this XML parent from
    * left to right, separated by a space.
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index d0bd0e98da3..7a987e04da3 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.0.11
+
+### New Queries
+
+* The query "XPath query built from user-controlled sources" (`py/xpath-injection`) has been promoted from experimental to the main query pack. Its results will now appear by default. This query was originally [submitted as an experimental query by @porcupineyhairs](https://github.com/github/codeql/pull/6331).
+
 ## 0.0.10
 
 ### New Queries
diff --git a/python/ql/src/Classes/ClassAttributes.qll b/python/ql/src/Classes/ClassAttributes.qll
index edd17be6044..25a02627393 100644
--- a/python/ql/src/Classes/ClassAttributes.qll
+++ b/python/ql/src/Classes/ClassAttributes.qll
@@ -1,7 +1,7 @@
 import python
 private import semmle.python.pointsto.PointsTo
 
-/** Helper class for UndefinedClassAttribute.ql and MaybeUndefinedClassAttribute.ql */
+/** A helper class for UndefinedClassAttribute.ql and MaybeUndefinedClassAttribute.ql */
 class CheckClass extends ClassObject {
   private predicate ofInterest() {
     not this.unknowableAttributes() and
diff --git a/python/ql/src/Exceptions/UnguardedNextInGenerator.ql b/python/ql/src/Exceptions/UnguardedNextInGenerator.ql
index c4d7cc956a0..0ff11dfd5b0 100755
--- a/python/ql/src/Exceptions/UnguardedNextInGenerator.ql
+++ b/python/ql/src/Exceptions/UnguardedNextInGenerator.ql
@@ -32,7 +32,11 @@ predicate guarded_not_empty_sequence(EssaVariable sequence) {
   sequence.getDefinition() instanceof EssaEdgeRefinement
 }
 
-/** The pattern `next(iter(x))` is often used where `x` is known not be empty. Check for that. */
+/**
+ * Holds if `iterator` is not exhausted.
+ *
+ * The pattern `next(iter(x))` is often used where `x` is known not be empty. Check for that.
+ */
 predicate iter_not_exhausted(EssaVariable iterator) {
   exists(EssaVariable sequence |
     call_to_iter(iterator.getDefinition().(AssignmentDefinition).getValue(), sequence) and
diff --git a/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll b/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll
index 7849c881338..1ba8a1843d9 100644
--- a/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll
+++ b/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll
@@ -1,7 +1,7 @@
 import python
 
 /** A string constant that looks like it may be used in string formatting operations. */
-library class PossibleAdvancedFormatString extends StrConst {
+class PossibleAdvancedFormatString extends StrConst {
   PossibleAdvancedFormatString() { this.getText().matches("%{%}%") }
 
   private predicate field(int start, int end) {
diff --git a/python/ql/src/Imports/DeprecatedModule.ql b/python/ql/src/Imports/DeprecatedModule.ql
index 62d17bd5e22..5f5a8af3ae9 100644
--- a/python/ql/src/Imports/DeprecatedModule.ql
+++ b/python/ql/src/Imports/DeprecatedModule.ql
@@ -13,7 +13,7 @@
 import python
 
 /**
- * The module `name` was deprecated in Python version `major`.`minor`,
+ * Holds if the module `name` was deprecated in Python version `major`.`minor`,
  * and module `instead` should be used instead (or `instead = "no replacement"`)
  */
 predicate deprecated_module(string name, string instead, int major, int minor) {
diff --git a/python/ql/src/Lexical/CommentedOutCode.qll b/python/ql/src/Lexical/CommentedOutCode.qll
index afe72e927a6..b26daad1491 100644
--- a/python/ql/src/Lexical/CommentedOutCode.qll
+++ b/python/ql/src/Lexical/CommentedOutCode.qll
@@ -40,16 +40,6 @@ private predicate class_statement(Comment c) {
 
 private predicate triple_quote(Comment c) { c.getText().regexpMatch("#.*(\"\"\"|''').*") }
 
-private predicate triple_quoted_string_part(Comment start, Comment end) {
-  triple_quote(start) and end = start
-  or
-  exists(Comment mid |
-    triple_quoted_string_part(start, mid) and
-    end = non_empty_following(mid) and
-    not triple_quote(end)
-  )
-}
-
 private predicate maybe_code(Comment c) {
   not non_code(c) and not filler(c) and not endline_comment(c) and not file_or_url(c)
   or
@@ -158,11 +148,11 @@ private predicate commented_out_code_block(Comment start, Comment end) {
   not commented_out_code(non_empty_following(end))
 }
 
-/* A single line comment that appears to be commented out code */
+/** A single line comment that appears to be commented out code */
 class CommentedOutCodeLine extends Comment {
   CommentedOutCodeLine() { exists(CommentedOutCodeBlock b | b.contains(this)) }
 
-  /* Whether this commented-out code line is likely to be example code embedded in a larger comment. */
+  /** Holds if this commented-out code line is likely to be example code embedded in a larger comment. */
   predicate maybeExampleCode() {
     exists(CommentedOutCodeBlock block |
       block.contains(this) and
@@ -178,7 +168,7 @@ class CommentedOutCodeBlock extends @py_comment {
   /** Gets a textual representation of this element. */
   string toString() { result = "Commented out code" }
 
-  /** Whether this commented-out code block contains the comment c */
+  /** Holds if this commented-out code block contains the comment c */
   predicate contains(Comment c) {
     this = c
     or
@@ -189,7 +179,7 @@ class CommentedOutCodeBlock extends @py_comment {
     )
   }
 
-  /** The length of this comment block (in comments) */
+  /** Gets the length of this comment block (in comments) */
   int length() { result = count(Comment c | this.contains(c)) }
 
   /**
diff --git a/python/ql/src/Resources/FileOpen.qll b/python/ql/src/Resources/FileOpen.qll
index c2df0d6263a..41cb27cc1e2 100644
--- a/python/ql/src/Resources/FileOpen.qll
+++ b/python/ql/src/Resources/FileOpen.qll
@@ -66,7 +66,7 @@ predicate passes_open_files(Variable v, ControlFlowNode test, boolean sense) {
   )
 }
 
-/* Helper for `def_is_open` to give better join order */
+// Helper for `def_is_open` to give better join order
 private predicate passes_open_files(PyEdgeRefinement refinement) {
   passes_open_files(refinement.getSourceVariable(), refinement.getPredecessor().getLastNode(),
     refinement.getSense())
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
index b3482012e9a..120a7967b3a 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
@@ -40,13 +40,16 @@ private import semmle.python.objects.ObjectInternal
 /**
  * A callable that is considered a "safe" external API from a security perspective.
  */
-class SafeExternalAPI extends Unit {
+class SafeExternalApi extends Unit {
   /** Gets a callable that is considered a "safe" external API from a security perspective. */
   abstract DataFlowPrivate::DataFlowCallable getSafeCallable();
 }
 
+/** DEPRECATED: Alias for SafeExternalApi */
+deprecated class SafeExternalAPI = SafeExternalApi;
+
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPI extends SafeExternalAPI {
+private class DefaultSafeExternalApi extends SafeExternalApi {
   override DataFlowPrivate::DataFlowCallable getSafeCallable() {
     exists(CallableValue cv | cv = result.getCallableValue() |
       cv = Value::named(["len", "isinstance", "getattr", "hasattr"])
@@ -61,15 +64,15 @@ private class DefaultSafeExternalAPI extends SafeExternalAPI {
 }
 
 /** A node representing data being passed to an external API through a call. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   DataFlowPrivate::DataFlowCall call;
   DataFlowPrivate::DataFlowCallable callable;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     exists(call.getLocation().getFile().getRelativePath()) and
     callable = call.getCallable() and
-    not any(SafeExternalAPI safe).getSafeCallable() = callable and
+    not any(SafeExternalApi safe).getSafeCallable() = callable and
     exists(Value cv | cv = callable.getCallableValue() |
       cv.isAbsent()
       or
@@ -98,38 +101,47 @@ class ExternalAPIDataNode extends DataFlow::Node {
   DataFlowPrivate::DataFlowCallable getCallable() { result = callable }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
+
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(DataFlowPrivate::DataFlowCallable callable, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(DataFlowPrivate::DataFlowCallable callable, int index) {
+    exists(UntrustedExternalApiDataNode n |
       callable = n.getCallable() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getCallable(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getCallable(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -143,7 +155,7 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
       DataFlowPrivate::DataFlowCallable callable, int index, string callableString,
       string indexString
     |
-      this = TExternalAPIParameter(callable, index) and
+      this = TExternalApiParameter(callable, index) and
       indexString = "param " + index and
       exists(CallableValue cv | cv = callable.getCallableValue() |
         callableString =
@@ -167,6 +179,9 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
   }
 }
 
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
+
 /** Gets the fully qualified name for the `BuiltinFunctionValue` bfv. */
 private string pretty_builtin_function_value(BuiltinFunctionValue bfv) {
   exists(Builtin b | b = bfv.(BuiltinFunctionObjectInternal).getBuiltin() |
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
index 8ab05fc611f..ac374311ee8 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
@@ -11,7 +11,7 @@
 import python
 import ExternalAPIs
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql b/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
index a7991c4ef60..6426854222c 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
@@ -14,11 +14,11 @@ import ExternalAPIs
 import DataFlow::PathGraph
 
 from
-  UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink,
-  ExternalAPIUsedWithUntrustedData externalAPI
+  UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink,
+  ExternalApiUsedWithUntrustedData externalApi
 where
-  sink.getNode() = externalAPI.getUntrustedDataNode() and
+  sink.getNode() = externalApi.getUntrustedDataNode() and
   config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink,
-  "Call to " + externalAPI.toString() + " with untrusted data from $@.", source.getNode(),
+  "Call to " + externalApi.toString() + " with untrusted data from $@.", source.getNode(),
   source.toString()
diff --git a/python/ql/src/Security/CWE-022/TarSlip.ql b/python/ql/src/Security/CWE-022/TarSlip.ql
index f671072a6ef..b8365b0f53a 100644
--- a/python/ql/src/Security/CWE-022/TarSlip.ql
+++ b/python/ql/src/Security/CWE-022/TarSlip.ql
@@ -122,7 +122,7 @@ class ExtractMembersSink extends TaintSink {
 class TarFileInfoSanitizer extends Sanitizer {
   TarFileInfoSanitizer() { this = "TarInfo sanitizer" }
 
-  /** The test `if <path_sanitizing_test>:` clears taint on its `false` edge. */
+  /* The test `if <path_sanitizing_test>:` clears taint on its `false` edge. */
   override predicate sanitizingEdge(TaintKind taint, PyEdgeRefinement test) {
     taint instanceof TarFileInfo and
     clears_taint_on_false_edge(test.getTest(), test.getSense())
diff --git a/python/ql/src/Security/CWE-079/ReflectedXss.ql b/python/ql/src/Security/CWE-079/ReflectedXss.ql
index 4d91ce2ad49..99ed1cccc8d 100644
--- a/python/ql/src/Security/CWE-079/ReflectedXss.ql
+++ b/python/ql/src/Security/CWE-079/ReflectedXss.ql
@@ -17,7 +17,7 @@ import python
 import semmle.python.security.dataflow.ReflectedXSS
 import DataFlow::PathGraph
 
-from ReflectedXSS::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from ReflectedXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "a user-provided value"
diff --git a/python/ql/src/Security/CWE-116/BadTagFilter.ql b/python/ql/src/Security/CWE-116/BadTagFilter.ql
index 44305bff876..654df65275b 100644
--- a/python/ql/src/Security/CWE-116/BadTagFilter.ql
+++ b/python/ql/src/Security/CWE-116/BadTagFilter.ql
@@ -16,6 +16,6 @@
 
 import semmle.python.security.BadTagFilterQuery
 
-from HTMLMatchingRegExp regexp, string msg
+from HtmlMatchingRegExp regexp, string msg
 where msg = min(string m | isBadRegexpFilter(regexp, m) | m order by m.length(), m) // there might be multiple, we arbitrarily pick the shortest one
 select regexp, msg
diff --git a/python/ql/src/Security/CWE-327/TlsLibraryModel.qll b/python/ql/src/Security/CWE-327/TlsLibraryModel.qll
index e650bc52c6a..3d78d7a845c 100644
--- a/python/ql/src/Security/CWE-327/TlsLibraryModel.qll
+++ b/python/ql/src/Security/CWE-327/TlsLibraryModel.qll
@@ -85,7 +85,7 @@ abstract class TlsLibrary extends string {
   bindingset[this]
   TlsLibrary() { any() }
 
-  /** The name of a specific protocol version. */
+  /** Gets the name of a specific protocol version. */
   abstract string specific_version_name(ProtocolVersion version);
 
   /** Gets a name, which is a member of `version_constants`, that can be used to specify the protocol family `family`. */
diff --git a/python/ql/src/Variables/Definition.qll b/python/ql/src/Variables/Definition.qll
index 76f3986d605..be8c9490788 100644
--- a/python/ql/src/Variables/Definition.qll
+++ b/python/ql/src/Variables/Definition.qll
@@ -5,12 +5,12 @@ import python
  */
 class Definition extends NameNode, DefinitionNode {
   /**
-   * The variable defined by this control-flow node.
+   * Gets the variable defined by this control-flow node.
    */
   Variable getVariable() { this.defines(result) }
 
   /**
-   * The SSA variable corresponding to the current definition. Since SSA variables
+   * Gets the SSA variable corresponding to the current definition. Since SSA variables
    * are only generated for definitions with at least one use, not all definitions
    * will have an SSA variable.
    */
@@ -67,7 +67,7 @@ class Definition extends NameNode, DefinitionNode {
   }
 
   /**
-   * An immediate re-definition of this definition's variable.
+   * Gets an immediate re-definition of this definition's variable.
    */
   Definition getARedef() {
     result != this and
diff --git a/python/ql/src/Variables/MultiplyDefined.ql b/python/ql/src/Variables/MultiplyDefined.ql
index c7f09987ff1..a8fedd25156 100644
--- a/python/ql/src/Variables/MultiplyDefined.ql
+++ b/python/ql/src/Variables/MultiplyDefined.ql
@@ -47,6 +47,8 @@ predicate simple_literal(Expr e) {
 }
 
 /**
+ * Holds if the redefinition is uninteresting.
+ *
  * A multiple definition is 'uninteresting' if it sets a variable to a
  * simple literal before reassigning it.
  * x = None
diff --git a/python/ql/src/Variables/ShadowBuiltin.ql b/python/ql/src/Variables/ShadowBuiltin.ql
index 7e3b305380d..7e4a8580a93 100644
--- a/python/ql/src/Variables/ShadowBuiltin.ql
+++ b/python/ql/src/Variables/ShadowBuiltin.ql
@@ -17,30 +17,13 @@ import Shadowing
 import semmle.python.types.Builtins
 
 predicate allow_list(string name) {
-  /* These are rarely used and thus unlikely to be confusing */
-  name = "iter" or
-  name = "next" or
-  name = "input" or
-  name = "file" or
-  name = "apply" or
-  name = "slice" or
-  name = "buffer" or
-  name = "coerce" or
-  name = "intern" or
-  name = "exit" or
-  name = "quit" or
-  name = "license" or
-  /* These are short and/or hard to avoid */
-  name = "dir" or
-  name = "id" or
-  name = "max" or
-  name = "min" or
-  name = "sum" or
-  name = "cmp" or
-  name = "chr" or
-  name = "ord" or
-  name = "bytes" or
-  name = "_"
+  name in [
+      /* These are rarely used and thus unlikely to be confusing */
+      "iter", "next", "input", "file", "apply", "slice", "buffer", "coerce", "intern", "exit",
+      "quit", "license",
+      /* These are short and/or hard to avoid */
+      "dir", "id", "max", "min", "sum", "cmp", "chr", "ord", "bytes", "_",
+    ]
 }
 
 predicate shadows(Name d, string name, Function scope, int line) {
diff --git a/python/ql/src/Variables/Undefined.qll b/python/ql/src/Variables/Undefined.qll
index ae401a83aaf..e31a99507d2 100644
--- a/python/ql/src/Variables/Undefined.qll
+++ b/python/ql/src/Variables/Undefined.qll
@@ -2,7 +2,7 @@ import python
 import Loop
 import semmle.python.dataflow.TaintTracking
 
-/** Marker for "uninitialized". */
+/** A marker for "uninitialized". */
 class Uninitialized extends TaintKind {
   Uninitialized() { this = "undefined" }
 }
diff --git a/python/ql/src/analysis/Consistency.ql b/python/ql/src/analysis/Consistency.ql
index ae48f126235..adaf8d2edba 100644
--- a/python/ql/src/analysis/Consistency.ql
+++ b/python/ql/src/analysis/Consistency.ql
@@ -259,7 +259,7 @@ predicate file_consistency(string clsname, string problem, string what) {
   exists(Container f |
     clsname = f.getAQlClass() and
     uniqueness_error(count(f.toString()), "toString", problem) and
-    what = "file " + f.getName()
+    what = "file " + f.getAbsolutePath()
   )
 }
 
diff --git a/python/ql/src/analysis/DefinitionTracking.qll b/python/ql/src/analysis/DefinitionTracking.qll
index b64f131e5bc..90166b84991 100644
--- a/python/ql/src/analysis/DefinitionTracking.qll
+++ b/python/ql/src/analysis/DefinitionTracking.qll
@@ -467,10 +467,10 @@ Definition getUniqueDefinition(Expr use) {
   not result = TLocalDefinition(use)
 }
 
-/** Helper class to get suitable locations for attributes */
-class NiceLocationExpr extends @py_expr {
+/** A helper class to get suitable locations for attributes */
+class NiceLocationExpr extends Expr {
   /** Gets a textual representation of this element. */
-  string toString() { result = this.(Expr).toString() }
+  override string toString() { result = this.(Expr).toString() }
 
   /**
    * Holds if this element is at the specified location.
diff --git a/python/ql/src/analysis/ImportFailure.ql b/python/ql/src/analysis/ImportFailure.ql
index 9ed1fd001c8..62de72f3b3e 100644
--- a/python/ql/src/analysis/ImportFailure.ql
+++ b/python/ql/src/analysis/ImportFailure.ql
@@ -58,7 +58,7 @@ predicate ok_to_fail(ImportExpr ie) {
   os_specific_import(ie) != get_os()
 }
 
-class VersionTest extends @py_flow_node {
+class VersionTest extends ControlFlowNode {
   VersionTest() {
     exists(string name |
       name.matches("%version%") and
@@ -66,7 +66,7 @@ class VersionTest extends @py_flow_node {
     )
   }
 
-  string toString() { result = "VersionTest" }
+  override string toString() { result = "VersionTest" }
 }
 
 /** A guard on the version of the Python interpreter */
diff --git a/python/ql/src/change-notes/2022-02-09-promote-xpath-injection.md b/python/ql/src/change-notes/released/0.0.11.md
similarity index 91%
rename from python/ql/src/change-notes/2022-02-09-promote-xpath-injection.md
rename to python/ql/src/change-notes/released/0.0.11.md
index 0ce3dc623db..06e4fdadc41 100644
--- a/python/ql/src/change-notes/2022-02-09-promote-xpath-injection.md
+++ b/python/ql/src/change-notes/released/0.0.11.md
@@ -1,4 +1,5 @@
----
-category: newQuery
----
+## 0.0.11
+
+### New Queries
+
 * The query "XPath query built from user-controlled sources" (`py/xpath-injection`) has been promoted from experimental to the main query pack. Its results will now appear by default. This query was originally [submitted as an experimental query by @porcupineyhairs](https://github.com/github/codeql/pull/6331).
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql b/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql
index 24dbb61e738..177c58e2782 100644
--- a/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql
+++ b/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql
@@ -13,7 +13,7 @@ import python
 import experimental.semmle.python.Concepts
 import semmle.python.dataflow.new.DataFlow
 
-predicate authenticatesImproperly(LDAPBind ldapBind) {
+predicate authenticatesImproperly(LdapBind ldapBind) {
   (
     DataFlow::localFlow(DataFlow::exprNode(any(None noneName)), ldapBind.getPassword()) or
     not exists(ldapBind.getPassword())
@@ -25,6 +25,6 @@ predicate authenticatesImproperly(LDAPBind ldapBind) {
   )
 }
 
-from LDAPBind ldapBind
+from LdapBind ldapBind
 where authenticatesImproperly(ldapBind)
 select ldapBind, "The following LDAP bind operation is executed without authentication"
diff --git a/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql b/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql
index 2f071a60536..adff8dc173f 100644
--- a/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql
+++ b/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql
@@ -12,7 +12,7 @@ import python
 import experimental.semmle.python.Concepts
 import experimental.semmle.python.frameworks.JWT
 
-from JWTEncoding jwtEncoding, string affectedComponent
+from JwtEncoding jwtEncoding, string affectedComponent
 where
   affectedComponent = "algorithm" and
   isEmptyOrNone(jwtEncoding.getAlgorithm())
diff --git a/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql b/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql
index e1f1cbb95ba..0cb801cb849 100644
--- a/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql
+++ b/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql
@@ -12,6 +12,6 @@
 import python
 import experimental.semmle.python.Concepts
 
-from JWTDecoding jwtDecoding
+from JwtDecoding jwtDecoding
 where not jwtDecoding.verifiesSignature()
 select jwtDecoding.getPayload(), "is not verified with a cryptographic secret or public key."
diff --git a/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql b/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
index af2d6f8bc16..667894e896e 100644
--- a/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
+++ b/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
@@ -18,7 +18,7 @@ import ClientSuppliedIpUsedInSecurityCheckLib
 import DataFlow::PathGraph
 
 /**
- * Taint-tracking configuration tracing flow from obtaining a client ip from an HTTP header to a sensitive use.
+ * A taint-tracking configuration tracing flow from obtaining a client ip from an HTTP header to a sensitive use.
  */
 class ClientSuppliedIpUsedInSecurityCheckConfig extends TaintTracking::Configuration {
   ClientSuppliedIpUsedInSecurityCheckConfig() { this = "ClientSuppliedIpUsedInSecurityCheckConfig" }
diff --git a/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql b/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql
index 3557c4e33d5..88715203be8 100644
--- a/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql
+++ b/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql
@@ -14,7 +14,7 @@ import python
 import DataFlow::PathGraph
 import experimental.semmle.python.security.LDAPInsecureAuth
 
-from LDAPInsecureAuthConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from LdapInsecureAuthConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ is authenticated insecurely.", sink.getNode(),
   "This LDAP host"
diff --git a/python/ql/src/experimental/Security/CWE-611/SimpleXmlRpcServer.ql b/python/ql/src/experimental/Security/CWE-611/SimpleXmlRpcServer.ql
new file mode 100644
index 00000000000..cda0633690c
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-611/SimpleXmlRpcServer.ql
@@ -0,0 +1,25 @@
+/**
+ * @name SimpleXMLRPCServer DoS vulnerability
+ * @description SimpleXMLRPCServer is vulnerable to DoS attacks from untrusted user input
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id py/simple-xml-rpc-server-dos
+ * @tags security
+ *       external/cwe/cwe-776
+ */
+
+private import python
+private import experimental.semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+from DataFlow::CallCfgNode call, string kinds
+where
+  call = API::moduleImport("xmlrpc").getMember("server").getMember("SimpleXMLRPCServer").getACall() and
+  kinds =
+    strictconcat(ExperimentalXML::XMLVulnerabilityKind kind |
+      kind.isBillionLaughs() or kind.isQuadraticBlowup()
+    |
+      kind, ", "
+    )
+select call, "SimpleXMLRPCServer is vulnerable to: " + kinds + "."
diff --git a/python/ql/src/experimental/Security/CWE-611/XXE.xml b/python/ql/src/experimental/Security/CWE-611/XXE.xml
new file mode 100644
index 00000000000..ddd196f2f13
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-611/XXE.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<!DOCTYPE dt [
+<!ENTITY xxe SYSTEM "file:///etc/passwd">]>
+<test>&xxe;</test>
\ No newline at end of file
diff --git a/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.py b/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.py
new file mode 100644
index 00000000000..0e9eec933d7
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.py
@@ -0,0 +1,25 @@
+from flask import request, Flask
+import lxml.etree
+import xml.etree.ElementTree
+
+app = Flask(__name__)
+
+# BAD
+@app.route("/bad")
+def bad():
+    xml_content = request.args['xml_content']
+
+    parser = lxml.etree.XMLParser()
+    parsed_xml = xml.etree.ElementTree.fromstring(xml_content, parser=parser)
+
+    return parsed_xml.text
+
+# GOOD
+@app.route("/good")
+def good():
+    xml_content = request.args['xml_content']
+
+    parser = lxml.etree.XMLParser(resolve_entities=False)
+    parsed_xml = xml.etree.ElementTree.fromstring(xml_content, parser=parser)
+
+    return parsed_xml.text
\ No newline at end of file
diff --git a/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.qhelp b/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.qhelp
new file mode 100644
index 00000000000..6da1bf1d306
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.qhelp
@@ -0,0 +1,48 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Parsing untrusted XML files with a weakly configured XML parser may lead to attacks such as XML External Entity (XXE),
+Billion Laughs, Quadratic Blowup and DTD retrieval.
+This type of attack uses external entity references to access arbitrary files on a system, carry out denial of
+service, or server side request forgery. Even when the result of parsing is not returned to the user, out-of-band
+data retrieval techniques may allow attackers to steal sensitive data. Denial of services can also be carried out
+in this situation.
+</p>
+</overview>
+
+<recommendation>
+<p>
+Use <a href="https://pypi.org/project/defusedxml/">defusedxml</a>, a Python package aimed
+to prevent any potentially malicious operation.
+</p>
+</recommendation>
+
+<example>
+<p>
+The following example calls <code>xml.etree.ElementTree.fromstring</code> using a parser (<code>lxml.etree.XMLParser</code>)
+that is not safely configured on untrusted data, and is therefore inherently unsafe.
+</p>
+<sample src="XmlEntityInjection.py"/>
+<p>
+Providing an input (<code>xml_content</code>) like the following XML content against /bad, the request response would contain the contents of
+<code>/etc/passwd</code>.
+</p>
+<sample src="XXE.xml"/>
+</example>
+
+<references>
+<li>Python 3 <a href="https://docs.python.org/3/library/xml.html#xml-vulnerabilities">XML Vulnerabilities</a>.</li>
+<li>Python 2 <a href="https://docs.python.org/2/library/xml.html#xml-vulnerabilities">XML Vulnerabilities</a>.</li>
+<li>Python <a href="https://www.edureka.co/blog/python-xml-parser-tutorial/">XML Parsing</a>.</li>
+<li>OWASP vulnerability description: <a href="https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing">XML External Entity (XXE) Processing</a>.</li>
+<li>OWASP guidance on parsing xml files: <a href="https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#python">XXE Prevention Cheat Sheet</a>.</li>
+<li>Paper by Timothy Morgen: <a href="https://research.nccgroup.com/2014/05/19/xml-schema-dtd-and-entity-attacks-a-compendium-of-known-techniques/">XML Schema, DTD, and Entity Attacks</a></li>
+<li>Out-of-band data retrieval: Timur Yunusov &amp; Alexey Osipov, Black hat EU 2013: <a href="https://www.slideshare.net/qqlan/bh-ready-v4">XML Out-Of-Band Data Retrieval</a>.</li>
+<li>Denial of service attack (Billion laughs): <a href="https://en.wikipedia.org/wiki/Billion_laughs">Billion Laughs.</a></li>
+</references>
+
+</qhelp>
diff --git a/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.ql b/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.ql
new file mode 100644
index 00000000000..922ca346b17
--- /dev/null
+++ b/python/ql/src/experimental/Security/CWE-611/XmlEntityInjection.ql
@@ -0,0 +1,31 @@
+/**
+ * @name XML Entity injection
+ * @description User input should not be parsed allowing the injection of entities.
+ * @kind path-problem
+ * @problem.severity error
+ * @id py/xml-entity-injection
+ * @tags security
+ *       external/cwe/cwe-611
+ *       external/cwe/cwe-776
+ *       external/cwe/cwe-827
+ */
+
+// determine precision above
+import python
+import experimental.semmle.python.security.dataflow.XmlEntityInjection
+import DataFlow::PathGraph
+
+from
+  XmlEntityInjection::XmlEntityInjectionConfiguration config, DataFlow::PathNode source,
+  DataFlow::PathNode sink, string kinds
+where
+  config.hasFlowPath(source, sink) and
+  kinds =
+    strictconcat(string kind |
+      kind = sink.getNode().(XmlEntityInjection::Sink).getVulnerableKind()
+    |
+      kind, ", "
+    )
+select sink.getNode(), source, sink,
+  "$@ XML input is constructed from a $@ and is vulnerable to: " + kinds + ".", sink.getNode(),
+  "This", source.getNode(), "user-provided value"
diff --git a/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql b/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql
index 7ee3328f6f3..cd4405d301b 100644
--- a/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql
+++ b/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql
@@ -13,7 +13,7 @@ import python
 import experimental.semmle.python.security.injection.NoSQLInjection
 import DataFlow::PathGraph
 
-from NoSQLInjection::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from NoSqlInjection::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink, "$@ NoSQL query contains an unsanitized $@", sink, "This", source,
   "user-provided value"
diff --git a/python/ql/src/experimental/semmle/python/Concepts.qll b/python/ql/src/experimental/semmle/python/Concepts.qll
index bb83fbda583..6fdba4d3627 100644
--- a/python/ql/src/experimental/semmle/python/Concepts.qll
+++ b/python/ql/src/experimental/semmle/python/Concepts.qll
@@ -14,8 +14,76 @@ private import semmle.python.dataflow.new.RemoteFlowSources
 private import semmle.python.dataflow.new.TaintTracking
 private import experimental.semmle.python.Frameworks
 
+/**
+ * Since there is both XML module in normal and experimental Concepts,
+ * we have to rename the experimental module as this.
+ */
+module ExperimentalXML {
+  /**
+   * A kind of XML vulnerability.
+   *
+   * See https://pypi.org/project/defusedxml/#python-xml-libraries
+   */
+  class XMLVulnerabilityKind extends string {
+    XMLVulnerabilityKind() {
+      this in ["Billion Laughs", "Quadratic Blowup", "XXE", "DTD retrieval"]
+    }
+
+    /** Holds for Billion Laughs vulnerability kind. */
+    predicate isBillionLaughs() { this = "Billion Laughs" }
+
+    /** Holds for Quadratic Blowup vulnerability kind. */
+    predicate isQuadraticBlowup() { this = "Quadratic Blowup" }
+
+    /** Holds for XXE vulnerability kind. */
+    predicate isXxe() { this = "XXE" }
+
+    /** Holds for DTD retrieval vulnerability kind. */
+    predicate isDtdRetrieval() { this = "DTD retrieval" }
+  }
+
+  /**
+   * A data-flow node that parses XML.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `XMLParsing` instead.
+   */
+  class XMLParsing extends DataFlow::Node instanceof XMLParsing::Range {
+    /**
+     * Gets the argument containing the content to parse.
+     */
+    DataFlow::Node getAnInput() { result = super.getAnInput() }
+
+    /**
+     * Holds if this XML parsing is vulnerable to `kind`.
+     */
+    predicate vulnerableTo(XMLVulnerabilityKind kind) { super.vulnerableTo(kind) }
+  }
+
+  /** Provides classes for modeling XML parsing APIs. */
+  module XMLParsing {
+    /**
+     * A data-flow node that parses XML.
+     *
+     * Extend this class to model new APIs. If you want to refine existing API models,
+     * extend `XMLParsing` instead.
+     */
+    abstract class Range extends DataFlow::Node {
+      /**
+       * Gets the argument containing the content to parse.
+       */
+      abstract DataFlow::Node getAnInput();
+
+      /**
+       * Holds if this XML parsing is vulnerable to `kind`.
+       */
+      abstract predicate vulnerableTo(XMLVulnerabilityKind kind);
+    }
+  }
+}
+
 /** Provides classes for modeling LDAP query execution-related APIs. */
-module LDAPQuery {
+module LdapQuery {
   /**
    * A data-flow node that collects methods executing a LDAP query.
    *
@@ -30,16 +98,19 @@ module LDAPQuery {
   }
 }
 
+/** DEPRECATED: Alias for LdapQuery */
+deprecated module LDAPQuery = LdapQuery;
+
 /**
  * A data-flow node that collect methods executing a LDAP query.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `LDAPQuery::Range` instead.
  */
-class LDAPQuery extends DataFlow::Node {
-  LDAPQuery::Range range;
+class LdapQuery extends DataFlow::Node {
+  LdapQuery::Range range;
 
-  LDAPQuery() { this = range }
+  LdapQuery() { this = range }
 
   /**
    * Gets the argument containing the executed expression.
@@ -47,8 +118,11 @@ class LDAPQuery extends DataFlow::Node {
   DataFlow::Node getQuery() { result = range.getQuery() }
 }
 
+/** DEPRECATED: Alias for LdapQuery */
+deprecated class LDAPQuery = LdapQuery;
+
 /** Provides classes for modeling LDAP components escape-related APIs. */
-module LDAPEscape {
+module LdapEscape {
   /**
    * A data-flow node that collects functions escaping LDAP components.
    *
@@ -63,16 +137,19 @@ module LDAPEscape {
   }
 }
 
+/** DEPRECATED: Alias for LdapEscape */
+deprecated module LDAPEscape = LdapEscape;
+
 /**
  * A data-flow node that collects functions escaping LDAP components.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `LDAPEscape::Range` instead.
  */
-class LDAPEscape extends DataFlow::Node {
-  LDAPEscape::Range range;
+class LdapEscape extends DataFlow::Node {
+  LdapEscape::Range range;
 
-  LDAPEscape() { this = range }
+  LdapEscape() { this = range }
 
   /**
    * Gets the argument containing the escaped expression.
@@ -80,8 +157,11 @@ class LDAPEscape extends DataFlow::Node {
   DataFlow::Node getAnInput() { result = range.getAnInput() }
 }
 
+/** DEPRECATED: Alias for LdapEscape */
+deprecated class LDAPEscape = LdapEscape;
+
 /** Provides classes for modeling LDAP bind-related APIs. */
-module LDAPBind {
+module LdapBind {
   /**
    * A data-flow node that collects methods binding a LDAP connection.
    *
@@ -106,16 +186,19 @@ module LDAPBind {
   }
 }
 
+/** DEPRECATED: Alias for LdapBind */
+deprecated module LDAPBind = LdapBind;
+
 /**
  * A data-flow node that collects methods binding a LDAP connection.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `LDAPBind::Range` instead.
  */
-class LDAPBind extends DataFlow::Node {
-  LDAPBind::Range range;
+class LdapBind extends DataFlow::Node {
+  LdapBind::Range range;
 
-  LDAPBind() { this = range }
+  LdapBind() { this = range }
 
   /**
    * Gets the argument containing the binding host.
@@ -133,8 +216,11 @@ class LDAPBind extends DataFlow::Node {
   predicate useSSL() { range.useSSL() }
 }
 
+/** DEPRECATED: Alias for LdapBind */
+deprecated class LDAPBind = LdapBind;
+
 /** Provides classes for modeling SQL sanitization libraries. */
-module SQLEscape {
+module SqlEscape {
   /**
    * A data-flow node that collects functions that escape SQL statements.
    *
@@ -149,16 +235,19 @@ module SQLEscape {
   }
 }
 
+/** DEPRECATED: Alias for SqlEscape */
+deprecated module SQLEscape = SqlEscape;
+
 /**
  * A data-flow node that collects functions escaping SQL statements.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `SQLEscape::Range` instead.
  */
-class SQLEscape extends DataFlow::Node {
-  SQLEscape::Range range;
+class SqlEscape extends DataFlow::Node {
+  SqlEscape::Range range;
 
-  SQLEscape() { this = range }
+  SqlEscape() { this = range }
 
   /**
    * Gets the argument containing the raw SQL statement.
@@ -166,8 +255,11 @@ class SQLEscape extends DataFlow::Node {
   DataFlow::Node getAnInput() { result = range.getAnInput() }
 }
 
-/** Provides a class for modeling NoSQL execution APIs. */
-module NoSQLQuery {
+/** DEPRECATED: Alias for SqlEscape */
+deprecated class SQLEscape = SqlEscape;
+
+/** Provides a class for modeling NoSql execution APIs. */
+module NoSqlQuery {
   /**
    * A data-flow node that executes NoSQL queries.
    *
@@ -175,28 +267,34 @@ module NoSQLQuery {
    * extend `NoSQLQuery` instead.
    */
   abstract class Range extends DataFlow::Node {
-    /** Gets the argument that specifies the NoSQL query to be executed. */
+    /** Gets the argument that specifies the NoSql query to be executed. */
     abstract DataFlow::Node getQuery();
   }
 }
 
+/** DEPRECATED: Alias for NoSqlQuery */
+deprecated module NoSQLQuery = NoSqlQuery;
+
 /**
  * A data-flow node that executes NoSQL queries.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `NoSQLQuery::Range` instead.
  */
-class NoSQLQuery extends DataFlow::Node {
-  NoSQLQuery::Range range;
+class NoSqlQuery extends DataFlow::Node {
+  NoSqlQuery::Range range;
 
-  NoSQLQuery() { this = range }
+  NoSqlQuery() { this = range }
 
-  /** Gets the argument that specifies the NoSQL query to be executed. */
+  /** Gets the argument that specifies the NoSql query to be executed. */
   DataFlow::Node getQuery() { result = range.getQuery() }
 }
 
-/** Provides classes for modeling NoSQL sanitization-related APIs. */
-module NoSQLSanitizer {
+/** DEPRECATED: Alias for NoSqlQuery */
+deprecated class NoSQLQuery = NoSqlQuery;
+
+/** Provides classes for modeling NoSql sanitization-related APIs. */
+module NoSqlSanitizer {
   /**
    * A data-flow node that collects functions sanitizing NoSQL queries.
    *
@@ -204,26 +302,32 @@ module NoSQLSanitizer {
    * extend `NoSQLSanitizer` instead.
    */
   abstract class Range extends DataFlow::Node {
-    /** Gets the argument that specifies the NoSQL query to be sanitized. */
+    /** Gets the argument that specifies the NoSql query to be sanitized. */
     abstract DataFlow::Node getAnInput();
   }
 }
 
+/** DEPRECATED: Alias for NoSqlSanitizer */
+deprecated module NoSQLSanitizer = NoSqlSanitizer;
+
 /**
  * A data-flow node that collects functions sanitizing NoSQL queries.
  *
  * Extend this class to model new APIs. If you want to refine existing API models,
  * extend `NoSQLSanitizer::Range` instead.
  */
-class NoSQLSanitizer extends DataFlow::Node {
-  NoSQLSanitizer::Range range;
+class NoSqlSanitizer extends DataFlow::Node {
+  NoSqlSanitizer::Range range;
 
-  NoSQLSanitizer() { this = range }
+  NoSqlSanitizer() { this = range }
 
-  /** Gets the argument that specifies the NoSQL query to be sanitized. */
+  /** Gets the argument that specifies the NoSql query to be sanitized. */
   DataFlow::Node getAnInput() { result = range.getAnInput() }
 }
 
+/** DEPRECATED: Alias for NoSqlSanitizer */
+deprecated class NoSQLSanitizer = NoSqlSanitizer;
+
 /** Provides classes for modeling HTTP Header APIs. */
 module HeaderDeclaration {
   /**
@@ -268,7 +372,7 @@ class HeaderDeclaration extends DataFlow::Node {
 }
 
 /** Provides classes for modeling JWT encoding-related APIs. */
-module JWTEncoding {
+module JwtEncoding {
   /**
    * A data-flow node that collects methods encoding a JWT token.
    *
@@ -298,13 +402,16 @@ module JWTEncoding {
   }
 }
 
+/** DEPRECATED: Alias for JwtEncoding */
+deprecated module JWTEncoding = JwtEncoding;
+
 /**
  * A data-flow node that collects methods encoding a JWT token.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `JWTEncoding::Range` instead.
  */
-class JWTEncoding extends DataFlow::Node instanceof JWTEncoding::Range {
+class JwtEncoding extends DataFlow::Node instanceof JwtEncoding::Range {
   /**
    * Gets the argument containing the payload.
    */
@@ -326,8 +433,11 @@ class JWTEncoding extends DataFlow::Node instanceof JWTEncoding::Range {
   string getAlgorithmString() { result = super.getAlgorithmString() }
 }
 
+/** DEPRECATED: Alias for JwtEncoding */
+deprecated class JWTEncoding = JwtEncoding;
+
 /** Provides classes for modeling JWT decoding-related APIs. */
-module JWTDecoding {
+module JwtDecoding {
   /**
    * A data-flow node that collects methods decoding a JWT token.
    *
@@ -367,13 +477,16 @@ module JWTDecoding {
   }
 }
 
+/** DEPRECATED: Alias for JwtDecoding */
+deprecated module JWTDecoding = JwtDecoding;
+
 /**
  * A data-flow node that collects methods encoding a JWT token.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `JWTDecoding::Range` instead.
  */
-class JWTDecoding extends DataFlow::Node instanceof JWTDecoding::Range {
+class JwtDecoding extends DataFlow::Node instanceof JwtDecoding::Range {
   /**
    * Gets the argument containing the payload.
    */
@@ -404,3 +517,6 @@ class JWTDecoding extends DataFlow::Node instanceof JWTDecoding::Range {
    */
   predicate verifiesSignature() { super.verifiesSignature() }
 }
+
+/** DEPRECATED: Alias for JwtDecoding */
+deprecated class JWTDecoding = JwtDecoding;
diff --git a/python/ql/src/experimental/semmle/python/Frameworks.qll b/python/ql/src/experimental/semmle/python/Frameworks.qll
index 81b2c1bee23..edbed61c41c 100644
--- a/python/ql/src/experimental/semmle/python/Frameworks.qll
+++ b/python/ql/src/experimental/semmle/python/Frameworks.qll
@@ -3,6 +3,7 @@
  */
 
 private import experimental.semmle.python.frameworks.Stdlib
+private import experimental.semmle.python.frameworks.Xml
 private import experimental.semmle.python.frameworks.Flask
 private import experimental.semmle.python.frameworks.Django
 private import experimental.semmle.python.frameworks.Werkzeug
diff --git a/python/ql/src/experimental/semmle/python/frameworks/Django.qll b/python/ql/src/experimental/semmle/python/frameworks/Django.qll
index 55d3b4af35c..2c029a7ba8f 100644
--- a/python/ql/src/experimental/semmle/python/frameworks/Django.qll
+++ b/python/ql/src/experimental/semmle/python/frameworks/Django.qll
@@ -11,15 +11,15 @@ private import semmle.python.ApiGraphs
 import semmle.python.dataflow.new.RemoteFlowSources
 
 private module ExperimentalPrivateDjango {
-  private module django {
+  private module DjangoMod {
     API::Node http() { result = API::moduleImport("django").getMember("http") }
 
-    module http {
+    module Http {
       API::Node response() { result = http().getMember("response") }
 
       API::Node request() { result = http().getMember("request") }
 
-      module request {
+      module Request {
         module HttpRequest {
           class DjangoGETParameter extends DataFlow::Node, RemoteFlowSource::Range {
             DjangoGETParameter() { this = request().getMember("GET").getMember("get").getACall() }
@@ -29,7 +29,7 @@ private module ExperimentalPrivateDjango {
         }
       }
 
-      module response {
+      module Response {
         module HttpResponse {
           API::Node baseClassRef() {
             result = response().getMember("HttpResponse").getReturn()
diff --git a/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll b/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll
index 9286129cf6e..6085dddf5f8 100644
--- a/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll
+++ b/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll
@@ -60,7 +60,7 @@ private module LDAP {
      *
      * See `LDAP2QueryMethods`
      */
-    private class LDAP2Query extends DataFlow::CallCfgNode, LDAPQuery::Range {
+    private class LDAP2Query extends DataFlow::CallCfgNode, LdapQuery::Range {
       LDAP2Query() { this.getFunction() = ldapQuery() }
 
       override DataFlow::Node getQuery() {
@@ -98,7 +98,7 @@ private module LDAP {
      *
      * See `LDAP2BindMethods`
      */
-    private class LDAP2Bind extends DataFlow::CallCfgNode, LDAPBind::Range {
+    private class LDAP2Bind extends DataFlow::CallCfgNode, LdapBind::Range {
       LDAP2Bind() { this.getFunction() = ldapBind() }
 
       override DataFlow::Node getPassword() {
@@ -149,7 +149,7 @@ private module LDAP {
      *
      * See https://github.com/python-ldap/python-ldap/blob/7ce471e238cdd9a4dd8d17baccd1c9e05e6f894a/Lib/ldap/dn.py#L17
      */
-    private class LDAP2EscapeDNCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP2EscapeDNCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP2EscapeDNCall() { this = ldap().getMember("dn").getMember("escape_dn_chars").getACall() }
 
       override DataFlow::Node getAnInput() { result = this.getArg(0) }
@@ -160,7 +160,7 @@ private module LDAP {
      *
      * See https://www.python-ldap.org/en/python-ldap-3.3.0/reference/ldap-filter.html#ldap.filter.escape_filter_chars
      */
-    private class LDAP2EscapeFilterCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP2EscapeFilterCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP2EscapeFilterCall() {
         this = ldap().getMember("filter").getMember("escape_filter_chars").getACall()
       }
@@ -190,7 +190,7 @@ private module LDAP {
     /**
      * A class to find `ldap3` methods executing a query.
      */
-    private class LDAP3Query extends DataFlow::CallCfgNode, LDAPQuery::Range {
+    private class LDAP3Query extends DataFlow::CallCfgNode, LdapQuery::Range {
       LDAP3Query() {
         this.getFunction().(DataFlow::AttrRead).getObject().getALocalSource() =
           ldap3Connection().getACall() and
@@ -203,7 +203,7 @@ private module LDAP {
     /**
      * A class to find `ldap3` methods binding a connection.
      */
-    class LDAP3Bind extends DataFlow::CallCfgNode, LDAPBind::Range {
+    class LDAP3Bind extends DataFlow::CallCfgNode, LdapBind::Range {
       LDAP3Bind() { this = ldap3Connection().getACall() }
 
       override DataFlow::Node getPassword() {
@@ -241,7 +241,7 @@ private module LDAP {
      *
      * See https://github.com/cannatag/ldap3/blob/4d33166f0869b929f59c6e6825a1b9505eb99967/ldap3/utils/dn.py#L390
      */
-    private class LDAP3EscapeDNCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP3EscapeDNCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP3EscapeDNCall() { this = ldap3Utils().getMember("dn").getMember("escape_rdn").getACall() }
 
       override DataFlow::Node getAnInput() { result = this.getArg(0) }
@@ -252,7 +252,7 @@ private module LDAP {
      *
      * See https://github.com/cannatag/ldap3/blob/4d33166f0869b929f59c6e6825a1b9505eb99967/ldap3/utils/conv.py#L91
      */
-    private class LDAP3EscapeFilterCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP3EscapeFilterCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP3EscapeFilterCall() {
         this = ldap3Utils().getMember("conv").getMember("escape_filter_chars").getACall()
       }
diff --git a/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll b/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll
index 545a7e9d6a5..bdd067218b3 100644
--- a/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll
+++ b/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll
@@ -10,7 +10,7 @@ private import semmle.python.dataflow.new.RemoteFlowSources
 private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
-private module NoSQL {
+private module NoSql {
   // API Nodes returning `Mongo` instances.
   /** Gets a reference to `pymongo.MongoClient` */
   private API::Node pyMongo() {
@@ -153,7 +153,7 @@ private module NoSQL {
    *
    * `mongo.db.user.find({'name': safe_search})` would be a collection method call, and so the result.
    */
-  private class MongoCollectionCall extends DataFlow::CallCfgNode, NoSQLQuery::Range {
+  private class MongoCollectionCall extends DataFlow::CallCfgNode, NoSqlQuery::Range {
     MongoCollectionCall() { this.getFunction() = mongoCollectionMethod() }
 
     override DataFlow::Node getQuery() { result = this.getArg(0) }
@@ -174,7 +174,7 @@ private module NoSQL {
    *
    * `Movie.objects(__raw__=json_search)` would be the result.
    */
-  private class MongoEngineObjectsCall extends DataFlow::CallCfgNode, NoSQLQuery::Range {
+  private class MongoEngineObjectsCall extends DataFlow::CallCfgNode, NoSqlQuery::Range {
     MongoEngineObjectsCall() {
       this =
         [mongoEngine(), flask_MongoEngine()]
@@ -188,7 +188,7 @@ private module NoSQL {
   }
 
   /** Gets a reference to `mongosanitizer.sanitizer.sanitize` */
-  private class MongoSanitizerCall extends DataFlow::CallCfgNode, NoSQLSanitizer::Range {
+  private class MongoSanitizerCall extends DataFlow::CallCfgNode, NoSqlSanitizer::Range {
     MongoSanitizerCall() {
       this =
         API::moduleImport("mongosanitizer").getMember("sanitizer").getMember("sanitize").getACall()
@@ -202,7 +202,7 @@ private module NoSQL {
    * If at any time ObjectId can't parse it's input (like when a tainted dict in passed in),
    * then ObjectId will throw an error preventing the query from running.
    */
-  private class BsonObjectIdCall extends DataFlow::CallCfgNode, NoSQLSanitizer::Range {
+  private class BsonObjectIdCall extends DataFlow::CallCfgNode, NoSqlSanitizer::Range {
     BsonObjectIdCall() {
       this =
         API::moduleImport(["bson", "bson.objectid", "bson.json_util"])
diff --git a/python/ql/src/experimental/semmle/python/frameworks/Werkzeug.qll b/python/ql/src/experimental/semmle/python/frameworks/Werkzeug.qll
index dce67c258fb..20f751a8fb7 100644
--- a/python/ql/src/experimental/semmle/python/frameworks/Werkzeug.qll
+++ b/python/ql/src/experimental/semmle/python/frameworks/Werkzeug.qll
@@ -12,7 +12,7 @@ private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
 private module Werkzeug {
-  module datastructures {
+  module Datastructures {
     module Headers {
       class WerkzeugHeaderAddCall extends DataFlow::CallCfgNode, HeaderDeclaration::Range {
         WerkzeugHeaderAddCall() {
diff --git a/python/ql/src/experimental/semmle/python/frameworks/Xml.qll b/python/ql/src/experimental/semmle/python/frameworks/Xml.qll
new file mode 100644
index 00000000000..a2f36f66f2e
--- /dev/null
+++ b/python/ql/src/experimental/semmle/python/frameworks/Xml.qll
@@ -0,0 +1,466 @@
+/**
+ * Provides class and predicates to track external data that
+ * may represent malicious XML objects.
+ */
+
+private import python
+private import semmle.python.dataflow.new.DataFlow
+private import experimental.semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+module XML = ExperimentalXML;
+
+private module XmlEtree {
+  /**
+   * Provides models for `xml.etree` parsers
+   *
+   * See
+   * - https://docs.python.org/3.10/library/xml.etree.elementtree.html#xml.etree.ElementTree.XMLParser
+   * - https://docs.python.org/3.10/library/xml.etree.elementtree.html#xml.etree.ElementTree.XMLPullParser
+   */
+  module XMLParser {
+    /**
+     * A source of instances of `xml.etree` parsers, extend this class to model new instances.
+     *
+     * This can include instantiations of the class, return values from function
+     * calls, or a special parameter that will be set when functions are called by an external
+     * library.
+     *
+     * Use the predicate `XMLParser::instance()` to get references to instances of `xml.etree` parsers.
+     */
+    abstract class InstanceSource extends DataFlow::LocalSourceNode { }
+
+    /** A direct instantiation of `xml.etree` parsers. */
+    private class ClassInstantiation extends InstanceSource, DataFlow::CallCfgNode {
+      ClassInstantiation() {
+        this =
+          API::moduleImport("xml")
+              .getMember("etree")
+              .getMember("ElementTree")
+              .getMember("XMLParser")
+              .getACall()
+        or
+        this =
+          API::moduleImport("xml")
+              .getMember("etree")
+              .getMember("ElementTree")
+              .getMember("XMLPullParser")
+              .getACall()
+      }
+    }
+
+    /** Gets a reference to an `xml.etree` parser instance. */
+    private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
+      t.start() and
+      result instanceof InstanceSource
+      or
+      exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
+    }
+
+    /** Gets a reference to an `xml.etree` parser instance. */
+    DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
+
+    /**
+     * A call to the `feed` method of an `xml.etree` parser.
+     */
+    private class XMLEtreeParserFeedCall extends DataFlow::MethodCallNode, XML::XMLParsing::Range {
+      XMLEtreeParserFeedCall() { this.calls(instance(), "feed") }
+
+      override DataFlow::Node getAnInput() { result in [this.getArg(0), this.getArgByName("data")] }
+
+      override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+        kind.isBillionLaughs() or kind.isQuadraticBlowup()
+      }
+    }
+  }
+
+  /**
+   * A call to either of:
+   * - `xml.etree.ElementTree.fromstring`
+   * - `xml.etree.ElementTree.fromstringlist`
+   * - `xml.etree.ElementTree.XML`
+   * - `xml.etree.ElementTree.XMLID`
+   * - `xml.etree.ElementTree.parse`
+   * - `xml.etree.ElementTree.iterparse`
+   */
+  private class XMLEtreeParsing extends DataFlow::CallCfgNode, XML::XMLParsing::Range {
+    XMLEtreeParsing() {
+      this =
+        API::moduleImport("xml")
+            .getMember("etree")
+            .getMember("ElementTree")
+            .getMember(["fromstring", "fromstringlist", "XML", "XMLID", "parse", "iterparse"])
+            .getACall()
+    }
+
+    override DataFlow::Node getAnInput() {
+      result in [
+          this.getArg(0),
+          // fromstring / XML / XMLID
+          this.getArgByName("text"),
+          // fromstringlist
+          this.getArgByName("sequence"),
+          // parse / iterparse
+          this.getArgByName("source"),
+        ]
+    }
+
+    override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+      // note: it does not matter what `xml.etree` parser you are using, you cannot
+      // change the security features anyway :|
+      kind.isBillionLaughs() or kind.isQuadraticBlowup()
+    }
+  }
+}
+
+private module SaxBasedParsing {
+  /**
+   * A call to the `setFeature` method on a XML sax parser.
+   *
+   * See https://docs.python.org/3.10/library/xml.sax.reader.html#xml.sax.xmlreader.XMLReader.setFeature
+   */
+  class SaxParserSetFeatureCall extends DataFlow::MethodCallNode {
+    SaxParserSetFeatureCall() {
+      this =
+        API::moduleImport("xml")
+            .getMember("sax")
+            .getMember("make_parser")
+            .getReturn()
+            .getMember("setFeature")
+            .getACall()
+    }
+
+    // The keyword argument names does not match documentation. I checked (with Python
+    // 3.9.5) that the names used here actually works.
+    DataFlow::Node getFeatureArg() { result in [this.getArg(0), this.getArgByName("name")] }
+
+    DataFlow::Node getStateArg() { result in [this.getArg(1), this.getArgByName("state")] }
+  }
+
+  /** Gets a back-reference to the `setFeature` state argument `arg`. */
+  private DataFlow::TypeTrackingNode saxParserSetFeatureStateArgBacktracker(
+    DataFlow::TypeBackTracker t, DataFlow::Node arg
+  ) {
+    t.start() and
+    arg = any(SaxParserSetFeatureCall c).getStateArg() and
+    result = arg.getALocalSource()
+    or
+    exists(DataFlow::TypeBackTracker t2 |
+      result = saxParserSetFeatureStateArgBacktracker(t2, arg).backtrack(t2, t)
+    )
+  }
+
+  /** Gets a back-reference to the `setFeature` state argument `arg`. */
+  DataFlow::LocalSourceNode saxParserSetFeatureStateArgBacktracker(DataFlow::Node arg) {
+    result = saxParserSetFeatureStateArgBacktracker(DataFlow::TypeBackTracker::end(), arg)
+  }
+
+  /**
+   * Gets a reference to a XML sax parser that has `feature_external_ges` turned on.
+   *
+   * See https://docs.python.org/3/library/xml.sax.handler.html#xml.sax.handler.feature_external_ges
+   */
+  private DataFlow::Node saxParserWithFeatureExternalGesTurnedOn(DataFlow::TypeTracker t) {
+    t.start() and
+    exists(SaxParserSetFeatureCall call |
+      call.getFeatureArg() =
+        API::moduleImport("xml")
+            .getMember("sax")
+            .getMember("handler")
+            .getMember("feature_external_ges")
+            .getAUse() and
+      saxParserSetFeatureStateArgBacktracker(call.getStateArg())
+          .asExpr()
+          .(BooleanLiteral)
+          .booleanValue() = true and
+      result = call.getObject()
+    )
+    or
+    exists(DataFlow::TypeTracker t2 |
+      t = t2.smallstep(saxParserWithFeatureExternalGesTurnedOn(t2), result)
+    ) and
+    // take account of that we can set the feature to False, which makes the parser safe again
+    not exists(SaxParserSetFeatureCall call |
+      call.getObject() = result and
+      call.getFeatureArg() =
+        API::moduleImport("xml")
+            .getMember("sax")
+            .getMember("handler")
+            .getMember("feature_external_ges")
+            .getAUse() and
+      saxParserSetFeatureStateArgBacktracker(call.getStateArg())
+          .asExpr()
+          .(BooleanLiteral)
+          .booleanValue() = false
+    )
+  }
+
+  /**
+   * Gets a reference to a XML sax parser that has `feature_external_ges` turned on.
+   *
+   * See https://docs.python.org/3/library/xml.sax.handler.html#xml.sax.handler.feature_external_ges
+   */
+  DataFlow::Node saxParserWithFeatureExternalGesTurnedOn() {
+    result = saxParserWithFeatureExternalGesTurnedOn(DataFlow::TypeTracker::end())
+  }
+
+  /**
+   * A call to the `parse` method on a SAX XML parser.
+   */
+  private class XMLSaxInstanceParsing extends DataFlow::MethodCallNode, XML::XMLParsing::Range {
+    XMLSaxInstanceParsing() {
+      this =
+        API::moduleImport("xml")
+            .getMember("sax")
+            .getMember("make_parser")
+            .getReturn()
+            .getMember("parse")
+            .getACall()
+    }
+
+    override DataFlow::Node getAnInput() { result in [this.getArg(0), this.getArgByName("source")] }
+
+    override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+      // always vuln to these
+      (kind.isBillionLaughs() or kind.isQuadraticBlowup())
+      or
+      // can be vuln to other things if features has been turned on
+      this.getObject() = saxParserWithFeatureExternalGesTurnedOn() and
+      (kind.isXxe() or kind.isDtdRetrieval())
+    }
+  }
+
+  /**
+   * A call to either `parse` or `parseString` from `xml.sax` module.
+   *
+   * See:
+   * - https://docs.python.org/3.10/library/xml.sax.html#xml.sax.parse
+   * - https://docs.python.org/3.10/library/xml.sax.html#xml.sax.parseString
+   */
+  private class XMLSaxParsing extends DataFlow::MethodCallNode, XML::XMLParsing::Range {
+    XMLSaxParsing() {
+      this =
+        API::moduleImport("xml").getMember("sax").getMember(["parse", "parseString"]).getACall()
+    }
+
+    override DataFlow::Node getAnInput() {
+      result in [
+          this.getArg(0),
+          // parseString
+          this.getArgByName("string"),
+          // parse
+          this.getArgByName("source"),
+        ]
+    }
+
+    override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+      // always vuln to these
+      (kind.isBillionLaughs() or kind.isQuadraticBlowup())
+      or
+      // can be vuln to other things if features has been turned on
+      this.getObject() = saxParserWithFeatureExternalGesTurnedOn() and
+      (kind.isXxe() or kind.isDtdRetrieval())
+    }
+  }
+
+  /**
+   * A call to the `parse` or `parseString` methods from `xml.dom.minidom` or `xml.dom.pulldom`.
+   *
+   * Both of these modules are based on SAX parsers.
+   */
+  private class XMLDomParsing extends DataFlow::CallCfgNode, XML::XMLParsing::Range {
+    XMLDomParsing() {
+      this =
+        API::moduleImport("xml")
+            .getMember("dom")
+            .getMember(["minidom", "pulldom"])
+            .getMember(["parse", "parseString"])
+            .getACall()
+    }
+
+    override DataFlow::Node getAnInput() {
+      result in [
+          this.getArg(0),
+          // parseString
+          this.getArgByName("string"),
+          // minidom.parse
+          this.getArgByName("file"),
+          // pulldom.parse
+          this.getArgByName("stream_or_string"),
+        ]
+    }
+
+    DataFlow::Node getParserArg() { result in [this.getArg(1), this.getArgByName("parser")] }
+
+    override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+      this.getParserArg() = saxParserWithFeatureExternalGesTurnedOn() and
+      (kind.isXxe() or kind.isDtdRetrieval())
+      or
+      (kind.isBillionLaughs() or kind.isQuadraticBlowup())
+    }
+  }
+}
+
+private module Lxml {
+  /**
+   * Provides models for `lxml.etree` parsers.
+   *
+   * See https://lxml.de/apidoc/lxml.etree.html?highlight=xmlparser#lxml.etree.XMLParser
+   */
+  module XMLParser {
+    /**
+     * A source of instances of `lxml.etree` parsers, extend this class to model new instances.
+     *
+     * This can include instantiations of the class, return values from function
+     * calls, or a special parameter that will be set when functions are called by an external
+     * library.
+     *
+     * Use the predicate `XMLParser::instance()` to get references to instances of `lxml.etree` parsers.
+     */
+    abstract class InstanceSource extends DataFlow::LocalSourceNode {
+      /** Holds if this instance is vulnerable to `kind`. */
+      abstract predicate vulnerableTo(XML::XMLVulnerabilityKind kind);
+    }
+
+    /**
+     * A call to `lxml.etree.XMLParser`.
+     *
+     * See https://lxml.de/apidoc/lxml.etree.html?highlight=xmlparser#lxml.etree.XMLParser
+     */
+    private class LXMLParser extends InstanceSource, DataFlow::CallCfgNode {
+      LXMLParser() {
+        this = API::moduleImport("lxml").getMember("etree").getMember("XMLParser").getACall()
+      }
+
+      // NOTE: it's not possible to change settings of a parser after constructing it
+      override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+        kind.isXxe() and
+        (
+          // resolve_entities has default True
+          not exists(this.getArgByName("resolve_entities"))
+          or
+          this.getArgByName("resolve_entities").getALocalSource().asExpr() = any(True t)
+        )
+        or
+        (kind.isBillionLaughs() or kind.isQuadraticBlowup()) and
+        this.getArgByName("huge_tree").getALocalSource().asExpr() = any(True t) and
+        not this.getArgByName("resolve_entities").getALocalSource().asExpr() = any(False t)
+        or
+        kind.isDtdRetrieval() and
+        this.getArgByName("load_dtd").getALocalSource().asExpr() = any(True t) and
+        this.getArgByName("no_network").getALocalSource().asExpr() = any(False t)
+      }
+    }
+
+    /**
+     * A call to `lxml.etree.get_default_parser`.
+     *
+     * See https://lxml.de/apidoc/lxml.etree.html?highlight=xmlparser#lxml.etree.get_default_parser
+     */
+    private class LXMLDefaultParser extends InstanceSource, DataFlow::CallCfgNode {
+      LXMLDefaultParser() {
+        this =
+          API::moduleImport("lxml").getMember("etree").getMember("get_default_parser").getACall()
+      }
+
+      override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+        // as highlighted by
+        // https://lxml.de/apidoc/lxml.etree.html?highlight=xmlparser#lxml.etree.XMLParser
+        // by default XXE is allow. so as long as the default parser has not been
+        // overridden, the result is also vuln to XXE.
+        kind.isXxe()
+        // TODO: take into account that you can override the default parser with `lxml.etree.set_default_parser`.
+      }
+    }
+
+    /** Gets a reference to an `lxml.etree` parsers instance, with origin in `origin` */
+    private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t, InstanceSource origin) {
+      t.start() and
+      result = origin
+      or
+      exists(DataFlow::TypeTracker t2 | result = instance(t2, origin).track(t2, t))
+    }
+
+    /** Gets a reference to an `lxml.etree` parsers instance, with origin in `origin` */
+    DataFlow::Node instance(InstanceSource origin) {
+      instance(DataFlow::TypeTracker::end(), origin).flowsTo(result)
+    }
+
+    /** Gets a reference to an `lxml.etree` parser instance, that is vulnerable to `kind`. */
+    DataFlow::Node instanceVulnerableTo(XML::XMLVulnerabilityKind kind) {
+      exists(InstanceSource origin | result = instance(origin) and origin.vulnerableTo(kind))
+    }
+
+    /**
+     * A call to the `feed` method of an `lxml` parser.
+     */
+    private class LXMLParserFeedCall extends DataFlow::MethodCallNode, XML::XMLParsing::Range {
+      LXMLParserFeedCall() { this.calls(instance(_), "feed") }
+
+      override DataFlow::Node getAnInput() { result in [this.getArg(0), this.getArgByName("data")] }
+
+      override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+        this.calls(instanceVulnerableTo(kind), "feed")
+      }
+    }
+  }
+
+  /**
+   * A call to either of:
+   * - `lxml.etree.fromstring`
+   * - `lxml.etree.fromstringlist`
+   * - `lxml.etree.XML`
+   * - `lxml.etree.parse`
+   * - `lxml.etree.parseid`
+   *
+   * See https://lxml.de/apidoc/lxml.etree.html?highlight=parseids#lxml.etree.fromstring
+   */
+  private class LXMLParsing extends DataFlow::CallCfgNode, XML::XMLParsing::Range {
+    LXMLParsing() {
+      this =
+        API::moduleImport("lxml")
+            .getMember("etree")
+            .getMember(["fromstring", "fromstringlist", "XML", "parse", "parseid"])
+            .getACall()
+    }
+
+    override DataFlow::Node getAnInput() {
+      result in [
+          this.getArg(0),
+          // fromstring / XML
+          this.getArgByName("text"),
+          // fromstringlist
+          this.getArgByName("strings"),
+          // parse / parseid
+          this.getArgByName("source"),
+        ]
+    }
+
+    DataFlow::Node getParserArg() { result in [this.getArg(1), this.getArgByName("parser")] }
+
+    override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+      this.getParserArg() = XMLParser::instanceVulnerableTo(kind)
+      or
+      kind.isXxe() and
+      not exists(this.getParserArg())
+    }
+  }
+}
+
+private module Xmltodict {
+  /**
+   * A call to `xmltodict.parse`.
+   */
+  private class XMLtoDictParsing extends DataFlow::CallCfgNode, XML::XMLParsing::Range {
+    XMLtoDictParsing() { this = API::moduleImport("xmltodict").getMember("parse").getACall() }
+
+    override DataFlow::Node getAnInput() {
+      result in [this.getArg(0), this.getArgByName("xml_input")]
+    }
+
+    override predicate vulnerableTo(XML::XMLVulnerabilityKind kind) {
+      (kind.isBillionLaughs() or kind.isQuadraticBlowup()) and
+      this.getArgByName("disable_entities").getALocalSource().asExpr() = any(False f)
+    }
+  }
+}
diff --git a/python/ql/src/experimental/semmle/python/libraries/Authlib.qll b/python/ql/src/experimental/semmle/python/libraries/Authlib.qll
index 20aa37597ce..f8121630e39 100644
--- a/python/ql/src/experimental/semmle/python/libraries/Authlib.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/Authlib.qll
@@ -5,7 +5,7 @@ private import experimental.semmle.python.frameworks.JWT
 
 private module Authlib {
   /** Gets a reference to `authlib.jose.(jwt|JsonWebToken)` */
-  private API::Node authlibJWT() {
+  private API::Node authlibJwt() {
     result in [
         API::moduleImport("authlib").getMember("jose").getMember("jwt"),
         API::moduleImport("authlib").getMember("jose").getMember("JsonWebToken").getReturn()
@@ -13,10 +13,10 @@ private module Authlib {
   }
 
   /** Gets a reference to `jwt.encode` */
-  private API::Node authlibJWTEncode() { result = authlibJWT().getMember("encode") }
+  private API::Node authlibJwtEncode() { result = authlibJwt().getMember("encode") }
 
   /** Gets a reference to `jwt.decode` */
-  private API::Node authlibJWTDecode() { result = authlibJWT().getMember("decode") }
+  private API::Node authlibJwtDecode() { result = authlibJwt().getMember("decode") }
 
   /**
    * Gets a call to `authlib.jose.(jwt|JsonWebToken).encode`.
@@ -33,8 +33,8 @@ private module Authlib {
    * * `getAlgorithm()`'s result would be `"HS256"`.
    * * `getAlgorithmstring()`'s result would be `HS256`.
    */
-  private class AuthlibJWTEncodeCall extends DataFlow::CallCfgNode, JWTEncoding::Range {
-    AuthlibJWTEncodeCall() { this = authlibJWTEncode().getACall() }
+  private class AuthlibJwtEncodeCall extends DataFlow::CallCfgNode, JwtEncoding::Range {
+    AuthlibJwtEncodeCall() { this = authlibJwtEncode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(1) }
 
@@ -69,8 +69,8 @@ private module Authlib {
    * * `getPayload()`'s result would be `token`.
    * * `getKey()`'s result would be `key`.
    */
-  private class AuthlibJWTDecodeCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
-    AuthlibJWTDecodeCall() { this = authlibJWTDecode().getACall() }
+  private class AuthlibJwtDecodeCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
+    AuthlibJwtDecodeCall() { this = authlibJwtDecode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(0) }
 
diff --git a/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll b/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll
index b916d3be6f6..fb4764310c8 100644
--- a/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll
@@ -3,7 +3,7 @@ private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 private import experimental.semmle.python.frameworks.JWT
 
-private module PyJWT {
+private module PyJwt {
   /** Gets a reference to `jwt.encode` */
   private API::Node pyjwtEncode() { result = API::moduleImport("jwt").getMember("encode") }
 
@@ -25,8 +25,8 @@ private module PyJWT {
    * * `getAlgorithm()`'s result would be `"HS256"`.
    * * `getAlgorithmstring()`'s result would be `HS256`.
    */
-  private class PyJWTEncodeCall extends DataFlow::CallCfgNode, JWTEncoding::Range {
-    PyJWTEncodeCall() { this = pyjwtEncode().getACall() }
+  private class PyJwtEncodeCall extends DataFlow::CallCfgNode, JwtEncoding::Range {
+    PyJwtEncodeCall() { this = pyjwtEncode().getACall() }
 
     override DataFlow::Node getPayload() {
       result in [this.getArg(0), this.getArgByName("payload")]
@@ -63,8 +63,8 @@ private module PyJWT {
    * * `getOptions()`'s result would be `{"verify_signature": True}`.
    * * `verifiesSignature()` predicate would succeed.
    */
-  private class PyJWTDecodeCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
-    PyJWTDecodeCall() { this = pyjwtDecode().getACall() }
+  private class PyJwtDecodeCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
+    PyJwtDecodeCall() { this = pyjwtDecode().getACall() }
 
     override DataFlow::Node getPayload() { result in [this.getArg(0), this.getArgByName("jwt")] }
 
diff --git a/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll b/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll
index d91f32dd780..86efd7f86bf 100644
--- a/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll
@@ -5,13 +5,13 @@ private import experimental.semmle.python.frameworks.JWT
 
 private module PythonJose {
   /** Gets a reference to `jwt` */
-  private API::Node joseJWT() { result = API::moduleImport("jose").getMember("jwt") }
+  private API::Node joseJwt() { result = API::moduleImport("jose").getMember("jwt") }
 
   /** Gets a reference to `jwt.encode` */
-  private API::Node joseJWTEncode() { result = joseJWT().getMember("encode") }
+  private API::Node joseJwtEncode() { result = joseJwt().getMember("encode") }
 
   /** Gets a reference to `jwt.decode` */
-  private API::Node joseJWTDecode() { result = joseJWT().getMember("decode") }
+  private API::Node joseJwtDecode() { result = joseJwt().getMember("decode") }
 
   /**
    * Gets a call to `jwt.encode`.
@@ -28,8 +28,8 @@ private module PythonJose {
    * * `getAlgorithm()`'s result would be `"HS256"`.
    * * `getAlgorithmstring()`'s result would be `HS256`.
    */
-  private class JoseJWTEncodeCall extends DataFlow::CallCfgNode, JWTEncoding::Range {
-    JoseJWTEncodeCall() { this = joseJWTEncode().getACall() }
+  private class JoseJwtEncodeCall extends DataFlow::CallCfgNode, JwtEncoding::Range {
+    JoseJwtEncodeCall() { this = joseJwtEncode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(0) }
 
@@ -64,8 +64,8 @@ private module PythonJose {
    * * `getOptions()`'s result would be none.
    * * `verifiesSignature()` predicate would succeed.
    */
-  private class JoseJWTDecodeCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
-    JoseJWTDecodeCall() { this = joseJWTDecode().getACall() }
+  private class JoseJwtDecodeCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
+    JoseJwtDecodeCall() { this = joseJwtDecode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(0) }
 
diff --git a/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll b/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll
index 3a7bbc625bd..abfca2e6375 100644
--- a/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll
@@ -2,7 +2,7 @@ private import python
 private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
-private module Python_JWT {
+private module Python_Jwt {
   /**
    * Gets a call to `python_jwt.process_jwt`.
    *
@@ -21,7 +21,7 @@ private module Python_JWT {
    * * `getOptions()`'s result would be `none()`.
    * * `verifiesSignature()` predicate would succeed.
    */
-  private class PythonJwtProcessCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
+  private class PythonJwtProcessCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
     PythonJwtProcessCall() {
       this = API::moduleImport("python_jwt").getMember("process_jwt").getACall()
     }
diff --git a/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll b/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll
index 442a21de30f..e8cae547c68 100644
--- a/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll
+++ b/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll
@@ -18,8 +18,8 @@ string getPrivateHostRegex() {
 }
 
 // "ldap://somethingon.theinternet.com"
-class LDAPFullHost extends StrConst {
-  LDAPFullHost() {
+class LdapFullHost extends StrConst {
+  LdapFullHost() {
     exists(string s |
       s = this.getText() and
       s.regexpMatch(getFullHostRegex()) and
@@ -29,27 +29,39 @@ class LDAPFullHost extends StrConst {
   }
 }
 
-class LDAPSchema extends StrConst {
-  LDAPSchema() { this.getText().regexpMatch(getSchemaRegex()) }
+/** DEPRECATED: Alias for LdapFullHost */
+deprecated class LDAPFullHost = LdapFullHost;
+
+class LdapSchema extends StrConst {
+  LdapSchema() { this.getText().regexpMatch(getSchemaRegex()) }
 }
 
-class LDAPPrivateHost extends StrConst {
-  LDAPPrivateHost() { this.getText().regexpMatch(getPrivateHostRegex()) }
+/** DEPRECATED: Alias for LdapSchema */
+deprecated class LDAPSchema = LdapSchema;
+
+class LdapPrivateHost extends StrConst {
+  LdapPrivateHost() { this.getText().regexpMatch(getPrivateHostRegex()) }
 }
 
-predicate concatAndCompareAgainstFullHostRegex(LDAPSchema schema, StrConst host) {
-  not host instanceof LDAPPrivateHost and
+/** DEPRECATED: Alias for LdapPrivateHost */
+deprecated class LDAPPrivateHost = LdapPrivateHost;
+
+predicate concatAndCompareAgainstFullHostRegex(LdapSchema schema, StrConst host) {
+  not host instanceof LdapPrivateHost and
   (schema.getText() + host.getText()).regexpMatch(getFullHostRegex())
 }
 
 // "ldap://" + "somethingon.theinternet.com"
-class LDAPBothStrings extends BinaryExpr {
-  LDAPBothStrings() { concatAndCompareAgainstFullHostRegex(this.getLeft(), this.getRight()) }
+class LdapBothStrings extends BinaryExpr {
+  LdapBothStrings() { concatAndCompareAgainstFullHostRegex(this.getLeft(), this.getRight()) }
 }
 
+/** DEPRECATED: Alias for LdapBothStrings */
+deprecated class LDAPBothStrings = LdapBothStrings;
+
 // schema + host
-class LDAPBothVar extends BinaryExpr {
-  LDAPBothVar() {
+class LdapBothVar extends BinaryExpr {
+  LdapBothVar() {
     exists(SsaVariable schemaVar, SsaVariable hostVar |
       this.getLeft() = schemaVar.getVariable().getALoad() and // getAUse is incompatible with Expr
       this.getRight() = hostVar.getVariable().getALoad() and
@@ -61,9 +73,12 @@ class LDAPBothVar extends BinaryExpr {
   }
 }
 
+/** DEPRECATED: Alias for LdapBothVar */
+deprecated class LDAPBothVar = LdapBothVar;
+
 // schema + "somethingon.theinternet.com"
-class LDAPVarString extends BinaryExpr {
-  LDAPVarString() {
+class LdapVarString extends BinaryExpr {
+  LdapVarString() {
     exists(SsaVariable schemaVar |
       this.getLeft() = schemaVar.getVariable().getALoad() and
       concatAndCompareAgainstFullHostRegex(schemaVar
@@ -74,9 +89,12 @@ class LDAPVarString extends BinaryExpr {
   }
 }
 
+/** DEPRECATED: Alias for LdapVarString */
+deprecated class LDAPVarString = LdapVarString;
+
 // "ldap://" + host
-class LDAPStringVar extends BinaryExpr {
-  LDAPStringVar() {
+class LdapStringVar extends BinaryExpr {
+  LdapStringVar() {
     exists(SsaVariable hostVar |
       this.getRight() = hostVar.getVariable().getALoad() and
       concatAndCompareAgainstFullHostRegex(this.getLeft(),
@@ -85,22 +103,28 @@ class LDAPStringVar extends BinaryExpr {
   }
 }
 
+/** DEPRECATED: Alias for LdapStringVar */
+deprecated class LDAPStringVar = LdapStringVar;
+
 /**
  * A taint-tracking configuration for detecting LDAP insecure authentications.
  */
-class LDAPInsecureAuthConfig extends TaintTracking::Configuration {
-  LDAPInsecureAuthConfig() { this = "LDAPInsecureAuthConfig" }
+class LdapInsecureAuthConfig extends TaintTracking::Configuration {
+  LdapInsecureAuthConfig() { this = "LDAPInsecureAuthConfig" }
 
   override predicate isSource(DataFlow::Node source) {
     source instanceof RemoteFlowSource or
-    source.asExpr() instanceof LDAPFullHost or
-    source.asExpr() instanceof LDAPBothStrings or
-    source.asExpr() instanceof LDAPBothVar or
-    source.asExpr() instanceof LDAPVarString or
-    source.asExpr() instanceof LDAPStringVar
+    source.asExpr() instanceof LdapFullHost or
+    source.asExpr() instanceof LdapBothStrings or
+    source.asExpr() instanceof LdapBothVar or
+    source.asExpr() instanceof LdapVarString or
+    source.asExpr() instanceof LdapStringVar
   }
 
   override predicate isSink(DataFlow::Node sink) {
-    exists(LDAPBind ldapBind | not ldapBind.useSSL() and sink = ldapBind.getHost())
+    exists(LdapBind ldapBind | not ldapBind.useSSL() and sink = ldapBind.getHost())
   }
 }
+
+/** DEPRECATED: Alias for LdapInsecureAuthConfig */
+deprecated class LDAPInsecureAuthConfig = LdapInsecureAuthConfig;
diff --git a/python/ql/src/experimental/semmle/python/security/dataflow/XmlEntityInjection.qll b/python/ql/src/experimental/semmle/python/security/dataflow/XmlEntityInjection.qll
new file mode 100644
index 00000000000..35220e153d1
--- /dev/null
+++ b/python/ql/src/experimental/semmle/python/security/dataflow/XmlEntityInjection.qll
@@ -0,0 +1,28 @@
+import python
+import experimental.semmle.python.Concepts
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.dataflow.new.TaintTracking
+import semmle.python.dataflow.new.RemoteFlowSources
+import semmle.python.dataflow.new.BarrierGuards
+
+module XmlEntityInjection {
+  import XmlEntityInjectionCustomizations::XmlEntityInjection
+
+  class XmlEntityInjectionConfiguration extends TaintTracking::Configuration {
+    XmlEntityInjectionConfiguration() { this = "XmlEntityInjectionConfiguration" }
+
+    override predicate isSource(DataFlow::Node source) {
+      source instanceof RemoteFlowSourceAsSource
+    }
+
+    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
+
+    override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
+      guard instanceof SanitizerGuard
+    }
+
+    override predicate isAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+      any(AdditionalTaintStep s).step(nodeFrom, nodeTo)
+    }
+  }
+}
diff --git a/python/ql/src/experimental/semmle/python/security/dataflow/XmlEntityInjectionCustomizations.qll b/python/ql/src/experimental/semmle/python/security/dataflow/XmlEntityInjectionCustomizations.qll
new file mode 100644
index 00000000000..e420c738a97
--- /dev/null
+++ b/python/ql/src/experimental/semmle/python/security/dataflow/XmlEntityInjectionCustomizations.qll
@@ -0,0 +1,86 @@
+/**
+ * Provides default sources, sinks and sanitizers for detecting
+ * "ldap injection"
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+
+private import python
+private import semmle.python.dataflow.new.DataFlow
+private import experimental.semmle.python.Concepts
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.dataflow.new.BarrierGuards
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides default sources, sinks and sanitizers for detecting "xml injection"
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module XmlEntityInjection {
+  /**
+   * A data flow source for "xml injection" vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for "xml injection" vulnerabilities.
+   */
+  abstract class Sink extends DataFlow::Node {
+    /** Gets the kind of XML injection that this sink is vulnerable to. */
+    abstract string getVulnerableKind();
+  }
+
+  /**
+   * A sanitizer guard for "xml injection" vulnerabilities.
+   */
+  abstract class SanitizerGuard extends DataFlow::BarrierGuard { }
+
+  /**
+   * A unit class for adding additional taint steps.
+   *
+   * Extend this class to add additional taint steps that should apply to `XmlEntityInjection`
+   * taint configuration.
+   */
+  class AdditionalTaintStep extends Unit {
+    /**
+     * Holds if the step from `nodeFrom` to `nodeTo` should be considered a taint
+     * step for `XmlEntityInjection` configuration.
+     */
+    abstract predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo);
+  }
+
+  /**
+   * An input to a direct XML parsing function, considered as a flow sink.
+   *
+   * See `XML::XMLParsing`.
+   */
+  class XMLParsingInputAsSink extends Sink {
+    ExperimentalXML::XMLParsing xmlParsing;
+
+    XMLParsingInputAsSink() { this = xmlParsing.getAnInput() }
+
+    override string getVulnerableKind() { xmlParsing.vulnerableTo(result) }
+  }
+
+  /**
+   * A source of remote user input, considered as a flow source.
+   */
+  class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
+
+  /**
+   * A comparison with a constant string, considered as a sanitizer-guard.
+   */
+  class StringConstCompareAsSanitizerGuard extends SanitizerGuard, StringConstCompare { }
+
+  /**
+   * A taint step for `io`'s `StringIO` and `BytesIO` methods.
+   */
+  class IoAdditionalTaintStep extends AdditionalTaintStep {
+    override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+      exists(DataFlow::CallCfgNode ioCalls |
+        ioCalls = API::moduleImport("io").getMember(["StringIO", "BytesIO"]).getACall() and
+        nodeFrom = ioCalls.getArg(0) and
+        nodeTo = ioCalls
+      )
+    }
+  }
+}
diff --git a/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll b/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll
index b442f6b130c..e6f3832e4ff 100644
--- a/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll
+++ b/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll
@@ -5,7 +5,7 @@ import semmle.python.dataflow.new.RemoteFlowSources
 import experimental.semmle.python.Concepts
 import semmle.python.Concepts
 
-module NoSQLInjection {
+module NoSqlInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "NoSQLInjection" }
 
@@ -15,17 +15,17 @@ module NoSQLInjection {
     }
 
     override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-      sink = any(NoSQLQuery noSQLQuery).getQuery() and
+      sink = any(NoSqlQuery noSqlQuery).getQuery() and
       state instanceof ConvertedToDict
     }
 
-    override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    override predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) {
       // Block `RemoteInput` paths here, since they change state to `ConvertedToDict`
       exists(Decoding decoding | decoding.getFormat() = "JSON" and node = decoding.getOutput()) and
       state instanceof RemoteInput
     }
 
-    override predicate isAdditionalFlowStep(
+    override predicate isAdditionalTaintStep(
       DataFlow::Node nodeFrom, DataFlow::FlowState stateFrom, DataFlow::Node nodeTo,
       DataFlow::FlowState stateTo
     ) {
@@ -38,7 +38,7 @@ module NoSQLInjection {
     }
 
     override predicate isSanitizer(DataFlow::Node sanitizer) {
-      sanitizer = any(NoSQLSanitizer noSQLSanitizer).getAnInput()
+      sanitizer = any(NoSqlSanitizer noSqlSanitizer).getAnInput()
     }
   }
 
@@ -52,3 +52,6 @@ module NoSQLInjection {
     ConvertedToDict() { this = "ConvertedToDict" }
   }
 }
+
+/** DEPRECATED: Alias for NoSqlInjection */
+deprecated module NoSQLInjection = NoSqlInjection;
diff --git a/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll b/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll
index 56189a80891..eb696c60315 100644
--- a/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll
+++ b/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll
@@ -25,7 +25,7 @@ module XSLTInjection {
     ExternalXmlStringKind() { this = "etree.XML string" }
 
     override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-      etreeXML(fromnode, tonode) and result instanceof ExternalXmlKind
+      etreeXml(fromnode, tonode) and result instanceof ExternalXmlKind
       or
       etreeFromStringList(fromnode, tonode) and result instanceof ExternalXmlKind
       or
@@ -40,7 +40,7 @@ module XSLTInjection {
     ExternalXmlKind() { this = "lxml etree xml" }
   }
 
-  private predicate etreeXML(ControlFlowNode fromnode, CallNode tonode) {
+  private predicate etreeXml(ControlFlowNode fromnode, CallNode tonode) {
     // etree.XML("<xmlContent>")
     exists(CallNode call | call.getFunction().(AttrNode).getObject("XML").pointsTo(etree()) |
       call.getArg(0) = fromnode and
diff --git a/python/ql/src/experimental/semmle/python/templates/Airspeed.qll b/python/ql/src/experimental/semmle/python/templates/Airspeed.qll
index bb07ef46249..dc266ac0f82 100644
--- a/python/ql/src/experimental/semmle/python/templates/Airspeed.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Airspeed.qll
@@ -8,7 +8,7 @@ import experimental.semmle.python.templates.SSTISink
 deprecated ClassValue theAirspeedTemplateClass() { result = Value::named("airspeed.Template") }
 
 /**
- * Sink representing the `airspeed.Template` class instantiation argument.
+ * A sink representing the `airspeed.Template` class instantiation argument.
  *
  *  import airspeed
  *  temp = airspeed.Template(`"sink"`)
diff --git a/python/ql/src/experimental/semmle/python/templates/Bottle.qll b/python/ql/src/experimental/semmle/python/templates/Bottle.qll
index e4c676b09ec..1f5bd2bba85 100644
--- a/python/ql/src/experimental/semmle/python/templates/Bottle.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Bottle.qll
@@ -10,7 +10,7 @@ deprecated ClassValue theBottleSimpleTemplateClass() {
 }
 
 /**
- * Sink representing the `bottle.SimpleTemplate` class instantiation argument.
+ * A sink representing the `bottle.SimpleTemplate` class instantiation argument.
  *
  *  from bottle import SimpleTemplate
  *  template = SimpleTemplate(`sink`)
@@ -29,7 +29,7 @@ deprecated class BottleSimpleTemplateSink extends SSTISink {
 }
 
 /**
- * Sink representing the `bottle.template` function call argument.
+ * A sink representing the `bottle.template` function call argument.
  *
  *  from bottle import template
  *  tmp = template(`sink`)
diff --git a/python/ql/src/experimental/semmle/python/templates/Chameleon.qll b/python/ql/src/experimental/semmle/python/templates/Chameleon.qll
index 7e99686b09a..f094dda97b5 100644
--- a/python/ql/src/experimental/semmle/python/templates/Chameleon.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Chameleon.qll
@@ -10,7 +10,7 @@ deprecated ClassValue theChameleonPageTemplateClass() {
 }
 
 /**
- * Sink representing the `chameleon.PageTemplate` class instantiation argument.
+ * A sink representing the `chameleon.PageTemplate` class instantiation argument.
  *
  *  from chameleon import PageTemplate
  *  template = PageTemplate(`sink`)
diff --git a/python/ql/src/experimental/semmle/python/templates/Cheetah.qll b/python/ql/src/experimental/semmle/python/templates/Cheetah.qll
index 93c849786bf..9812fdb7c88 100644
--- a/python/ql/src/experimental/semmle/python/templates/Cheetah.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Cheetah.qll
@@ -10,7 +10,7 @@ deprecated ClassValue theCheetahTemplateClass() {
 }
 
 /**
- * Sink representing the instantiation argument of any class which derives from
+ * A sink representing the instantiation argument of any class which derives from
  * the `Cheetah.Template.Template` class .
  *
  *  from Cheetah.Template import Template
diff --git a/python/ql/src/experimental/semmle/python/templates/Chevron.qll b/python/ql/src/experimental/semmle/python/templates/Chevron.qll
index 35baf7c1be6..cc93016891c 100644
--- a/python/ql/src/experimental/semmle/python/templates/Chevron.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Chevron.qll
@@ -8,7 +8,7 @@ import experimental.semmle.python.templates.SSTISink
 deprecated Value theChevronRenderFunc() { result = Value::named("chevron.render") }
 
 /**
- * Sink representing the `chevron.render` function call argument.
+ * A sink representing the `chevron.render` function call argument.
  *
  *  import chevron
  *  tmp = chevron.render(`sink`,{ 'key' : 'value' })
diff --git a/python/ql/src/experimental/semmle/python/templates/DjangoTemplate.qll b/python/ql/src/experimental/semmle/python/templates/DjangoTemplate.qll
index 35c1f46e681..e0dfeb52494 100644
--- a/python/ql/src/experimental/semmle/python/templates/DjangoTemplate.qll
+++ b/python/ql/src/experimental/semmle/python/templates/DjangoTemplate.qll
@@ -7,7 +7,7 @@ import experimental.semmle.python.templates.SSTISink
 deprecated ClassValue theDjangoTemplateClass() { result = Value::named("django.template.Template") }
 
 /**
- * Sink representng `django.template.Template` class instantiation argument.
+ * A sink representng `django.template.Template` class instantiation argument.
  *
  *  from django.template import Template
  *  template = Template(`sink`)
diff --git a/python/ql/src/experimental/semmle/python/templates/FlaskTemplate.qll b/python/ql/src/experimental/semmle/python/templates/FlaskTemplate.qll
index 20352d77330..9e768472ec1 100644
--- a/python/ql/src/experimental/semmle/python/templates/FlaskTemplate.qll
+++ b/python/ql/src/experimental/semmle/python/templates/FlaskTemplate.qll
@@ -9,7 +9,7 @@ deprecated Value theFlaskRenderTemplateClass() {
 }
 
 /**
- * Sink representng `flask.render_template_string` function call argument.
+ * A sink representng `flask.render_template_string` function call argument.
  *
  *  from flask import render_template_string
  *  render_template_string(`sink`)
diff --git a/python/ql/src/experimental/semmle/python/templates/Genshi.qll b/python/ql/src/experimental/semmle/python/templates/Genshi.qll
index 26038ae266a..c808d7c60f8 100644
--- a/python/ql/src/experimental/semmle/python/templates/Genshi.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Genshi.qll
@@ -15,7 +15,7 @@ deprecated ClassValue theGenshiMarkupTemplateClass() {
 }
 
 /**
- * Sink representing the `genshi.template.TextTemplate` class instantiation argument.
+ * A sink representing the `genshi.template.TextTemplate` class instantiation argument.
  *
  *  from genshi.template import TextTemplate
  *  tmpl = TextTemplate('sink')
@@ -34,7 +34,7 @@ deprecated class GenshiTextTemplateSink extends SSTISink {
 }
 
 /**
- * Sink representing the `genshi.template.MarkupTemplate` class instantiation argument.
+ * A sink representing the `genshi.template.MarkupTemplate` class instantiation argument.
  *
  *  from genshi.template import MarkupTemplate
  *  tmpl = MarkupTemplate('sink')
diff --git a/python/ql/src/experimental/semmle/python/templates/Jinja.qll b/python/ql/src/experimental/semmle/python/templates/Jinja.qll
index 7fc66cf0884..44bc103cf04 100644
--- a/python/ql/src/experimental/semmle/python/templates/Jinja.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Jinja.qll
@@ -11,7 +11,7 @@ deprecated ClassValue theJinja2TemplateClass() { result = Value::named("jinja2.T
 deprecated Value theJinja2FromStringValue() { result = Value::named("jinja2.from_string") }
 
 /**
- * Sink representing the `jinja2.Template` class instantiation argument.
+ * A sink representing the `jinja2.Template` class instantiation argument.
  *
  *  from jinja2 import Template
  *  template = Template(`sink`)
@@ -30,7 +30,7 @@ deprecated class Jinja2TemplateSink extends SSTISink {
 }
 
 /**
- * Sink representing the `jinja2.from_string` function call argument.
+ * A sink representing the `jinja2.from_string` function call argument.
  *
  *  from jinja2 import from_string
  *  template = from_string(`sink`)
diff --git a/python/ql/src/experimental/semmle/python/templates/Mako.qll b/python/ql/src/experimental/semmle/python/templates/Mako.qll
index f7faa2f0ff8..b8634b3001a 100644
--- a/python/ql/src/experimental/semmle/python/templates/Mako.qll
+++ b/python/ql/src/experimental/semmle/python/templates/Mako.qll
@@ -8,7 +8,7 @@ import experimental.semmle.python.templates.SSTISink
 deprecated ClassValue theMakoTemplateClass() { result = Value::named("mako.template.Template") }
 
 /**
- * Sink representing the `mako.template.Template` class instantiation argument.
+ * A sink representing the `mako.template.Template` class instantiation argument.
  *
  *  from mako.template import Template
  *  mytemplate = Template("hello world!")
diff --git a/python/ql/src/experimental/semmle/python/templates/TRender.qll b/python/ql/src/experimental/semmle/python/templates/TRender.qll
index f33ec3077a3..8d5431ad9e0 100644
--- a/python/ql/src/experimental/semmle/python/templates/TRender.qll
+++ b/python/ql/src/experimental/semmle/python/templates/TRender.qll
@@ -8,7 +8,7 @@ import experimental.semmle.python.templates.SSTISink
 deprecated ClassValue theTRenderTemplateClass() { result = Value::named("trender.TRender") }
 
 /**
- * Sink representing the `trender.TRender` class instantiation argument.
+ * A sink representing the `trender.TRender` class instantiation argument.
  *
  *  from trender import TRender
  *  template = TRender(`sink`)
diff --git a/python/ql/src/printAst.ql b/python/ql/src/printAst.ql
index 883efaab793..e6af7e1eff1 100644
--- a/python/ql/src/printAst.ql
+++ b/python/ql/src/printAst.ql
@@ -12,7 +12,7 @@ import semmle.python.PrintAst
 import analysis.DefinitionTracking
 
 /**
- * The source file to generate an AST from.
+ * Gets the source file that will be used to generate the AST.
  */
 external string selectedSourceFile();
 
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index a3c02f6ac5e..9e4b8141aee 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: 
   - python
   - queries
diff --git a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefaultCustomizations.qll b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefaultCustomizations.qll
index 6abb3f80085..7906d6bf0d4 100644
--- a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefaultCustomizations.qll
+++ b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefaultCustomizations.qll
@@ -81,7 +81,7 @@ module ModificationOfParameterWithDefault {
   }
 
   /**
-   * A name of a list function that modifies the list.
+   * Gets the name of a list function that modifies the list.
    * See https://docs.python.org/3/tutorial/datastructures.html#more-on-lists
    */
   string list_modifying_method() {
@@ -89,7 +89,7 @@ module ModificationOfParameterWithDefault {
   }
 
   /**
-   * A name of a dict function that modifies the dict.
+   * Gets the name of a dict function that modifies the dict.
    * See https://docs.python.org/3/library/stdtypes.html#dict
    */
   string dict_modifying_method() { result in ["clear", "pop", "popitem", "setdefault", "update"] }
diff --git a/python/ql/test/TestUtilities/InlineExpectationsTest.qll b/python/ql/test/TestUtilities/InlineExpectationsTest.qll
index 7d605a491ee..a4d264b2703 100644
--- a/python/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/python/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -124,7 +124,9 @@ abstract class InlineExpectationsTest extends string {
   abstract predicate hasActualResult(Location location, string element, string tag, string value);
 
   /**
-   * Like `hasActualResult`, but returns results that do not require a matching annotation.
+   * Holds if there is an optional result on the specified location.
+   *
+   * This is similar to `hasActualResult`, but returns results that do not require a matching annotation.
    * A failure will still arise if there is an annotation that does not match any results, but not vice versa.
    * Override this predicate to specify optional results.
    */
diff --git a/python/ql/test/experimental/dataflow/TestUtil/UnresolvedCalls.qll b/python/ql/test/experimental/dataflow/TestUtil/UnresolvedCalls.qll
index e984b525535..eaf480ec664 100644
--- a/python/ql/test/experimental/dataflow/TestUtil/UnresolvedCalls.qll
+++ b/python/ql/test/experimental/dataflow/TestUtil/UnresolvedCalls.qll
@@ -7,7 +7,7 @@ import TestUtilities.InlineExpectationsTest
 class UnresolvedCallExpectations extends InlineExpectationsTest {
   UnresolvedCallExpectations() { this = "UnresolvedCallExpectations" }
 
-  override string getARelevantTag() { result = ["unresolved_call"] }
+  override string getARelevantTag() { result = "unresolved_call" }
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(location.getFile().getRelativePath()) and
diff --git a/python/ql/test/experimental/library-tests/CallGraph/CallGraphTest.qll b/python/ql/test/experimental/library-tests/CallGraph/CallGraphTest.qll
index 268acca608a..0f8b3162980 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/CallGraphTest.qll
+++ b/python/ql/test/experimental/library-tests/CallGraph/CallGraphTest.qll
@@ -88,7 +88,7 @@ private newtype TCallGraphResolver =
   TPointsToResolver() or
   TTypeTrackerResolver()
 
-/** Describes a method of call graph resolution */
+/** A method of call graph resolution */
 abstract class CallGraphResolver extends TCallGraphResolver {
   abstract predicate callEdge(Call call, Function callable);
 
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/ExperimentalXmlConceptsTests.expected b/python/ql/test/experimental/library-tests/frameworks/XML/ExperimentalXmlConceptsTests.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/ExperimentalXmlConceptsTests.ql b/python/ql/test/experimental/library-tests/frameworks/XML/ExperimentalXmlConceptsTests.ql
new file mode 100644
index 00000000000..81bc391d0e5
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/ExperimentalXmlConceptsTests.ql
@@ -0,0 +1,33 @@
+import python
+import experimental.semmle.python.Concepts
+import experimental.semmle.python.frameworks.Xml
+import semmle.python.dataflow.new.DataFlow
+import TestUtilities.InlineExpectationsTest
+private import semmle.python.dataflow.new.internal.PrintNode
+
+class XmlParsingTest extends InlineExpectationsTest {
+  XmlParsingTest() { this = "XmlParsingTest" }
+
+  override string getARelevantTag() { result in ["input", "vuln"] }
+
+  override predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(location.getFile().getRelativePath()) and
+    exists(XML::XMLParsing parsing |
+      exists(DataFlow::Node input |
+        input = parsing.getAnInput() and
+        location = input.getLocation() and
+        element = input.toString() and
+        value = prettyNodeForInlineTest(input) and
+        tag = "input"
+      )
+      or
+      exists(XML::XMLVulnerabilityKind kind |
+        parsing.vulnerableTo(kind) and
+        location = parsing.getLocation() and
+        element = parsing.toString() and
+        value = "'" + kind + "'" and
+        tag = "vuln"
+      )
+    )
+  }
+}
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/lxml_etree.py b/python/ql/test/experimental/library-tests/frameworks/XML/lxml_etree.py
new file mode 100644
index 00000000000..22930a58af3
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/lxml_etree.py
@@ -0,0 +1,54 @@
+from io import StringIO
+import lxml.etree
+
+x = "some xml"
+
+# different parsing methods
+lxml.etree.fromstring(x) # $ input=x vuln='XXE'
+lxml.etree.fromstring(text=x) # $ input=x vuln='XXE'
+
+lxml.etree.fromstringlist([x]) # $ input=List vuln='XXE'
+lxml.etree.fromstringlist(strings=[x]) # $ input=List vuln='XXE'
+
+lxml.etree.XML(x) # $ input=x vuln='XXE'
+lxml.etree.XML(text=x) # $ input=x vuln='XXE'
+
+lxml.etree.parse(StringIO(x)) # $ input=StringIO(..) vuln='XXE'
+lxml.etree.parse(source=StringIO(x)) # $ input=StringIO(..) vuln='XXE'
+
+lxml.etree.parseid(StringIO(x)) # $ input=StringIO(..) vuln='XXE'
+lxml.etree.parseid(source=StringIO(x)) # $ input=StringIO(..) vuln='XXE'
+
+# With default parsers (nothing changed)
+parser = lxml.etree.XMLParser()
+lxml.etree.fromstring(x, parser=parser) # $ input=x vuln='XXE'
+
+parser = lxml.etree.get_default_parser()
+lxml.etree.fromstring(x, parser=parser) # $ input=x vuln='XXE'
+
+# manual use of feed method
+parser = lxml.etree.XMLParser()
+parser.feed(x) # $ input=x vuln='XXE'
+parser.feed(data=x) # $ input=x vuln='XXE'
+parser.close()
+
+# XXE-safe
+parser = lxml.etree.XMLParser(resolve_entities=False)
+lxml.etree.fromstring(x, parser) # $ input=x
+lxml.etree.fromstring(x, parser=parser) # $ input=x
+
+# XXE-vuln
+parser = lxml.etree.XMLParser(resolve_entities=True)
+lxml.etree.fromstring(x, parser=parser) # $ input=x vuln='XXE'
+
+# Billion laughs vuln (also XXE)
+parser = lxml.etree.XMLParser(huge_tree=True)
+lxml.etree.fromstring(x, parser=parser) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup' vuln='XXE'
+
+# Safe for both Billion laughs and XXE
+parser = lxml.etree.XMLParser(resolve_entities=False, huge_tree=True)
+lxml.etree.fromstring(x, parser=parser) # $ input=x
+
+# DTD retrival vuln (also XXE)
+parser = lxml.etree.XMLParser(load_dtd=True, no_network=False)
+lxml.etree.fromstring(x, parser=parser) # $ input=x vuln='DTD retrieval' vuln='XXE'
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/poc/PoC.py b/python/ql/test/experimental/library-tests/frameworks/XML/poc/PoC.py
new file mode 100644
index 00000000000..adcace1aa0a
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/poc/PoC.py
@@ -0,0 +1,677 @@
+#!/usr/bin/env python3
+
+# this file doesn't have a .py extension so the extractor doesn't pick it up, so it
+# doesn't have to be annotated
+
+# This file shows the ways to make exploit vulnerable XML parsing
+# see
+# https://pypi.org/project/defusedxml/#python-xml-libraries
+# https://docs.python.org/3.10/library/xml.html#xml-vulnerabilities
+
+import pathlib
+from flask import Flask
+import threading
+import multiprocessing
+import time
+from io import StringIO
+import pytest
+
+HOST = "localhost"
+PORT = 8080
+
+
+FLAG_PATH = pathlib.Path(__file__).with_name("flag")
+
+# ==============================================================================
+# xml samples
+
+ok_xml = f"""<?xml version="1.0"?>
+<test>hello world</test>
+"""
+
+local_xxe = f"""<?xml version="1.0"?>
+<!DOCTYPE dt [
+    <!ENTITY xxe SYSTEM "file://{FLAG_PATH}">
+]>
+<test>&xxe;</test>
+"""
+
+remote_xxe = f"""<?xml version="1.0"?>
+<!DOCTYPE dt [
+    <!ENTITY remote_xxe SYSTEM "http://{HOST}:{PORT}/xxe">
+]>
+<test>&remote_xxe;</test>
+"""
+
+billion_laughs = """<?xml version="1.0"?>
+<!DOCTYPE lolz [
+ <!ENTITY lol "lol">
+ <!ELEMENT lolz (#PCDATA)>
+ <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
+ <!ENTITY lol2 "&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;">
+ <!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
+ <!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
+ <!ENTITY lol5 "&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;">
+ <!ENTITY lol6 "&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;">
+ <!ENTITY lol7 "&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;">
+ <!ENTITY lol8 "&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;">
+ <!ENTITY lol9 "&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;">
+]>
+<lolz>&lol9;</lolz>"""
+
+quadratic_blowup = f"""<?xml version="1.0"?>
+<!DOCTYPE wolo [
+  <!ENTITY oops "{"a" * 100000}">
+]>
+<foo>{"&oops;"*20000}</foo>"""
+
+dtd_retrieval = f"""<?xml version="1.0"?>
+<!DOCTYPE dt PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://{HOST}:{PORT}/test.dtd">
+<foo>bar</foo>
+"""
+
+# ==============================================================================
+# other setup
+
+# we set up local Flask application so we can tests whether loading external resources
+# works (such as SSRF from DTD-retrival works)
+app = Flask(__name__)
+
+@app.route("/alive")
+def alive():
+    return "ok"
+
+hit_dtd = False
+@app.route("/test.dtd")
+def test_dtd():
+    global hit_dtd
+    hit_dtd = True
+    return """<?xml version="1.0" encoding="UTF-8"?>"""
+
+hit_xxe = False
+@app.route("/xxe")
+def test_xxe():
+    global hit_xxe
+    hit_xxe = True
+    return "ok"
+
+def run_app():
+    app.run(host=HOST, port=PORT)
+
+@pytest.fixture(scope="session", autouse=True)
+def flask_app_running():
+    # run flask in other thread
+    flask_thread = threading.Thread(target=run_app, daemon=True)
+    flask_thread.start()
+
+    # give flask a bit of time to start
+    time.sleep(0.1)
+
+    # ensure that the server works
+    import requests
+    requests.get(f"http://{HOST}:{PORT}/alive")
+
+    yield
+
+def expects_timeout(func):
+    def inner():
+        proc = multiprocessing.Process(target=func)
+        proc.start()
+        time.sleep(0.1)
+        assert proc.exitcode == None
+        proc.kill()
+        proc.join()
+    return inner
+
+
+class TestExpectsTimeout:
+    "test that expects_timeout works as expected"
+
+    @staticmethod
+    @expects_timeout
+    def test_slow():
+        time.sleep(1000)
+
+    @staticmethod
+    def test_fast():
+        @expects_timeout
+        def fast_func():
+            return "done!"
+
+        with pytest.raises(AssertionError):
+            fast_func()
+
+# ==============================================================================
+import xml.sax
+import xml.sax.handler
+
+class SimpleHandler(xml.sax.ContentHandler):
+    def __init__(self):
+        self.result = []
+
+    def characters(self, data):
+        self.result.append(data)
+
+class TestSax():
+    # always vuln to billion laughs, quadratic
+
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs_allowed_by_default():
+        parser = xml.sax.make_parser()
+        parser.parse(StringIO(billion_laughs))
+
+    @staticmethod
+    @expects_timeout
+    def test_quardratic_blowup_allowed_by_default():
+        parser = xml.sax.make_parser()
+        parser.parse(StringIO(quadratic_blowup))
+
+    @staticmethod
+    def test_ok_xml():
+        handler = SimpleHandler()
+        parser = xml.sax.make_parser()
+        parser.setContentHandler(handler)
+        parser.parse(StringIO(ok_xml))
+        assert handler.result == ["hello world"], handler.result
+
+    @staticmethod
+    def test_xxe_disabled_by_default():
+        handler = SimpleHandler()
+        parser = xml.sax.make_parser()
+        parser.setContentHandler(handler)
+        parser.parse(StringIO(local_xxe))
+        assert handler.result == [], handler.result
+
+    @staticmethod
+    def test_local_xxe_manually_enabled():
+        handler = SimpleHandler()
+        parser = xml.sax.make_parser()
+        parser.setContentHandler(handler)
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        parser.parse(StringIO(local_xxe))
+        assert handler.result[0] == "SECRET_FLAG", handler.result
+
+    @staticmethod
+    def test_remote_xxe_manually_enabled():
+        global hit_xxe
+        hit_xxe = False
+
+        handler = SimpleHandler()
+        parser = xml.sax.make_parser()
+        parser.setContentHandler(handler)
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        parser.parse(StringIO(remote_xxe))
+        assert handler.result == ["ok"], handler.result
+        assert hit_xxe == True
+
+    @staticmethod
+    def test_dtd_disabled_by_default():
+        global hit_dtd
+        hit_dtd = False
+
+        parser = xml.sax.make_parser()
+        parser.parse(StringIO(dtd_retrieval))
+        assert hit_dtd == False
+
+    @staticmethod
+    def test_dtd_manually_enabled():
+        global hit_dtd
+        hit_dtd = False
+
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        parser.parse(StringIO(dtd_retrieval))
+        assert hit_dtd == True
+
+
+# ==============================================================================
+import xml.etree.ElementTree
+
+class TestEtree:
+
+    # always vuln to billion laughs, quadratic
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs_allowed_by_default():
+        parser = xml.etree.ElementTree.XMLParser()
+        _root = xml.etree.ElementTree.fromstring(billion_laughs, parser=parser)
+
+    @staticmethod
+    @expects_timeout
+    def test_quardratic_blowup_allowed_by_default():
+        parser = xml.etree.ElementTree.XMLParser()
+        _root = xml.etree.ElementTree.fromstring(quadratic_blowup, parser=parser)
+
+    @staticmethod
+    def test_ok_xml():
+        parser = xml.etree.ElementTree.XMLParser()
+        root = xml.etree.ElementTree.fromstring(ok_xml, parser=parser)
+        assert root.tag == "test"
+        assert root.text == "hello world"
+
+    @staticmethod
+    def test_ok_xml_sax_parser():
+        # you _can_ pass a SAX parser to xml.etree... but it doesn't give you the output :|
+        parser = xml.sax.make_parser()
+        root = xml.etree.ElementTree.fromstring(ok_xml, parser=parser)
+        assert root == None
+
+    @staticmethod
+    def test_ok_xml_lxml_parser():
+        # this is technically possible, since parsers follow the same API, and the
+        # `fromstring` function is just a thin wrapper... seems very unlikely that
+        # anyone would do this though :|
+        parser = lxml.etree.XMLParser()
+        root = xml.etree.ElementTree.fromstring(ok_xml, parser=parser)
+        assert root.tag == "test"
+        assert root.text == "hello world"
+
+    @staticmethod
+    def test_xxe_not_possible():
+        parser = xml.etree.ElementTree.XMLParser()
+        try:
+            _root = xml.etree.ElementTree.fromstring(local_xxe, parser=parser)
+            assert False
+        except xml.etree.ElementTree.ParseError as e:
+            assert "undefined entity &xxe" in str(e)
+
+    @staticmethod
+    def test_dtd_not_possible():
+        global hit_dtd
+        hit_dtd = False
+
+        parser = xml.etree.ElementTree.XMLParser()
+        _root = xml.etree.ElementTree.fromstring(dtd_retrieval, parser=parser)
+        assert hit_dtd == False
+
+# ==============================================================================
+import lxml.etree
+
+class TestLxml:
+    # see https://lxml.de/apidoc/lxml.etree.html?highlight=xmlparser#lxml.etree.XMLParser
+    @staticmethod
+    def test_billion_laughs_disabled_by_default():
+        parser = lxml.etree.XMLParser()
+        try:
+            _root = lxml.etree.fromstring(billion_laughs, parser=parser)
+            assert False
+        except lxml.etree.XMLSyntaxError as e:
+            assert "Detected an entity reference loop" in str(e)
+
+    @staticmethod
+    def test_quardratic_blowup_disabled_by_default():
+        parser = lxml.etree.XMLParser()
+        try:
+            _root = lxml.etree.fromstring(quadratic_blowup, parser=parser)
+            assert False
+        except lxml.etree.XMLSyntaxError as e:
+            assert "Detected an entity reference loop" in str(e)
+
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs_manually_enabled():
+        parser = lxml.etree.XMLParser(huge_tree=True)
+        root = lxml.etree.fromstring(billion_laughs, parser=parser)
+
+    @staticmethod
+    @expects_timeout
+    def test_quadratic_blowup_manually_enabled():
+        parser = lxml.etree.XMLParser(huge_tree=True)
+        root = lxml.etree.fromstring(quadratic_blowup, parser=parser)
+
+    @staticmethod
+    def test_billion_laughs_huge_tree_not_enough():
+        parser = lxml.etree.XMLParser(huge_tree=True, resolve_entities=False)
+        root = lxml.etree.fromstring(billion_laughs, parser=parser)
+        assert root.tag == "lolz"
+        assert root.text == None
+
+    @staticmethod
+    def test_quadratic_blowup_huge_tree_not_enough():
+        parser = lxml.etree.XMLParser(huge_tree=True, resolve_entities=False)
+        root = lxml.etree.fromstring(quadratic_blowup, parser=parser)
+        assert root.tag == "foo"
+        assert root.text == None
+
+    @staticmethod
+    def test_ok_xml():
+        parser = lxml.etree.XMLParser()
+        root = lxml.etree.fromstring(ok_xml, parser=parser)
+        assert root.tag == "test"
+        assert root.text == "hello world"
+
+    @staticmethod
+    def test_local_xxe_enabled_by_default():
+        parser = lxml.etree.XMLParser()
+        root = lxml.etree.fromstring(local_xxe, parser=parser)
+        assert root.tag == "test"
+        assert root.text == "SECRET_FLAG\n", root.text
+
+    @staticmethod
+    def test_local_xxe_disabled():
+        parser = lxml.etree.XMLParser(resolve_entities=False)
+        root = lxml.etree.fromstring(local_xxe, parser=parser)
+        assert root.tag == "test"
+        assert root.text == None
+
+    @staticmethod
+    def test_remote_xxe_disabled_by_default():
+        global hit_xxe
+        hit_xxe = False
+
+        parser = lxml.etree.XMLParser()
+        try:
+            root = lxml.etree.fromstring(remote_xxe, parser=parser)
+            assert False
+        except lxml.etree.XMLSyntaxError as e:
+            assert "Failure to process entity remote_xxe" in str(e)
+        assert hit_xxe == False
+
+    @staticmethod
+    def test_remote_xxe_manually_enabled():
+        global hit_xxe
+        hit_xxe = False
+
+        parser = lxml.etree.XMLParser(no_network=False)
+        root = lxml.etree.fromstring(remote_xxe, parser=parser)
+        assert root.tag == "test"
+        assert root.text == "ok"
+        assert hit_xxe == True
+
+    @staticmethod
+    def test_dtd_disabled_by_default():
+        global hit_dtd
+        hit_dtd = False
+
+        parser = lxml.etree.XMLParser()
+        root = lxml.etree.fromstring(dtd_retrieval, parser=parser)
+        assert hit_dtd == False
+
+    @staticmethod
+    def test_dtd_manually_enabled():
+        global hit_dtd
+        hit_dtd = False
+
+        # Need to set BOTH load_dtd and no_network
+        parser = lxml.etree.XMLParser(load_dtd=True)
+        root = lxml.etree.fromstring(dtd_retrieval, parser=parser)
+        assert hit_dtd == False
+
+        parser = lxml.etree.XMLParser(no_network=False)
+        root = lxml.etree.fromstring(dtd_retrieval, parser=parser)
+        assert hit_dtd == False
+
+        parser = lxml.etree.XMLParser(load_dtd=True, no_network=False)
+        root = lxml.etree.fromstring(dtd_retrieval, parser=parser)
+        assert hit_dtd == True
+
+        hit_dtd = False
+
+        # Setting dtd_validation also does not allow the remote access
+        parser = lxml.etree.XMLParser(dtd_validation=True, load_dtd=True)
+        try:
+            root = lxml.etree.fromstring(dtd_retrieval, parser=parser)
+        except lxml.etree.XMLSyntaxError:
+            pass
+        assert hit_dtd == False
+
+
+# ==============================================================================
+
+import xmltodict
+
+class TestXmltodict:
+    @staticmethod
+    def test_billion_laughs_disabled_by_default():
+        d = xmltodict.parse(billion_laughs)
+        assert d == {"lolz": None}, d
+
+    @staticmethod
+    def test_quardratic_blowup_disabled_by_default():
+        d = xmltodict.parse(quadratic_blowup)
+        assert d == {"foo": None}, d
+
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs_manually_enabled():
+        xmltodict.parse(billion_laughs, disable_entities=False)
+
+    @staticmethod
+    @expects_timeout
+    def test_quardratic_blowup_manually_enabled():
+        xmltodict.parse(quadratic_blowup, disable_entities=False)
+
+    @staticmethod
+    def test_ok_xml():
+        d = xmltodict.parse(ok_xml)
+        assert d == {"test": "hello world"}, d
+
+    @staticmethod
+    def test_local_xxe_not_possible():
+        d = xmltodict.parse(local_xxe)
+        assert d == {"test": None}
+
+        d = xmltodict.parse(local_xxe, disable_entities=False)
+        assert d == {"test": None}
+
+    @staticmethod
+    def test_remote_xxe_not_possible():
+        global hit_xxe
+        hit_xxe = False
+
+        d = xmltodict.parse(remote_xxe)
+        assert d == {"test": None}
+        assert hit_xxe == False
+
+        d = xmltodict.parse(remote_xxe, disable_entities=False)
+        assert d == {"test": None}
+        assert hit_xxe == False
+
+    @staticmethod
+    def test_dtd_not_possible():
+        global hit_dtd
+        hit_dtd = False
+
+        d = xmltodict.parse(dtd_retrieval)
+        assert hit_dtd == False
+
+# ==============================================================================
+import xml.dom.minidom
+
+class TestMinidom:
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs():
+        xml.dom.minidom.parseString(billion_laughs)
+
+    @staticmethod
+    @expects_timeout
+    def test_quardratic_blowup():
+        xml.dom.minidom.parseString(quadratic_blowup)
+
+    @staticmethod
+    def test_ok_xml():
+        doc = xml.dom.minidom.parseString(ok_xml)
+        assert doc.documentElement.tagName == "test"
+        assert doc.documentElement.childNodes[0].data == "hello world"
+
+    @staticmethod
+    def test_xxe():
+        # disabled by default
+        doc = xml.dom.minidom.parseString(local_xxe)
+        assert doc.documentElement.tagName == "test"
+        assert doc.documentElement.childNodes == []
+
+        # but can be turned on
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        doc = xml.dom.minidom.parseString(local_xxe, parser=parser)
+        assert doc.documentElement.tagName == "test"
+        assert doc.documentElement.childNodes[0].data == "SECRET_FLAG"
+
+        # which also works remotely
+        global hit_xxe
+        hit_xxe = False
+
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        _doc = xml.dom.minidom.parseString(remote_xxe, parser=parser)
+        assert hit_xxe == True
+
+    @staticmethod
+    def test_dtd():
+        # not possible by default
+        global hit_dtd
+        hit_dtd = False
+
+        _doc = xml.dom.minidom.parseString(dtd_retrieval)
+        assert hit_dtd == False
+
+        # but can be turned on
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        _doc = xml.dom.minidom.parseString(dtd_retrieval, parser=parser)
+        assert hit_dtd == True
+
+# ==============================================================================
+import xml.dom.pulldom
+
+class TestPulldom:
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs():
+        doc = xml.dom.pulldom.parseString(billion_laughs)
+        # you NEED to iterate over the items for it to take long
+        for event, node in doc:
+            pass
+
+    @staticmethod
+    @expects_timeout
+    def test_quardratic_blowup():
+        doc = xml.dom.pulldom.parseString(quadratic_blowup)
+        for event, node in doc:
+            pass
+
+    @staticmethod
+    def test_ok_xml():
+        doc = xml.dom.pulldom.parseString(ok_xml)
+        for event, node in doc:
+            if event == xml.dom.pulldom.START_ELEMENT:
+                assert node.tagName == "test"
+            elif event == xml.dom.pulldom.CHARACTERS:
+                assert node.data == "hello world"
+
+    @staticmethod
+    def test_xxe():
+        # disabled by default
+        doc = xml.dom.pulldom.parseString(local_xxe)
+        found_flag = False
+        for event, node in doc:
+            if event == xml.dom.pulldom.START_ELEMENT:
+                assert node.tagName == "test"
+            elif event == xml.dom.pulldom.CHARACTERS:
+                if node.data == "SECRET_FLAG":
+                    found_flag = True
+        assert found_flag == False
+
+        # but can be turned on
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        doc = xml.dom.pulldom.parseString(local_xxe, parser=parser)
+        found_flag = False
+        for event, node in doc:
+            if event == xml.dom.pulldom.START_ELEMENT:
+                assert node.tagName == "test"
+            elif event == xml.dom.pulldom.CHARACTERS:
+                if node.data == "SECRET_FLAG":
+                    found_flag = True
+        assert found_flag == True
+
+        # which also works remotely
+        global hit_xxe
+        hit_xxe = False
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        doc = xml.dom.pulldom.parseString(remote_xxe, parser=parser)
+        assert hit_xxe == False
+        for event, node in doc:
+            pass
+        assert hit_xxe == True
+
+    @staticmethod
+    def test_dtd():
+        # not possible by default
+        global hit_dtd
+        hit_dtd = False
+
+        doc = xml.dom.pulldom.parseString(dtd_retrieval)
+        for event, node in doc:
+            pass
+        assert hit_dtd == False
+
+        # but can be turned on
+        parser = xml.sax.make_parser()
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        doc = xml.dom.pulldom.parseString(dtd_retrieval, parser=parser)
+        for event, node in doc:
+            pass
+        assert hit_dtd == True
+
+# ==============================================================================
+import xml.parsers.expat
+
+class TestExpat:
+    # this is the underlying parser implementation used by the rest of the Python
+    # standard library. But people are probably not using this directly.
+
+    @staticmethod
+    @expects_timeout
+    def test_billion_laughs():
+        parser = xml.parsers.expat.ParserCreate()
+        parser.Parse(billion_laughs, True)
+
+    @staticmethod
+    @expects_timeout
+    def test_quardratic_blowup():
+        parser = xml.parsers.expat.ParserCreate()
+        parser.Parse(quadratic_blowup, True)
+
+    @staticmethod
+    def test_ok_xml():
+        char_data_recv = []
+        def char_data_handler(data):
+            char_data_recv.append(data)
+
+        parser = xml.parsers.expat.ParserCreate()
+        parser.CharacterDataHandler = char_data_handler
+        parser.Parse(ok_xml, True)
+
+        assert char_data_recv == ["hello world"]
+
+    @staticmethod
+    def test_xxe():
+        # not vuln by default
+        char_data_recv = []
+        def char_data_handler(data):
+            char_data_recv.append(data)
+
+        parser = xml.parsers.expat.ParserCreate()
+        parser.CharacterDataHandler = char_data_handler
+        parser.Parse(local_xxe, True)
+
+        assert char_data_recv == []
+
+        # there might be ways to make it vuln, but I did not investigate futher.
+
+    @staticmethod
+    def test_dtd():
+        # not vuln by default
+        global hit_dtd
+        hit_dtd = False
+
+        parser = xml.parsers.expat.ParserCreate()
+        parser.Parse(dtd_retrieval, True)
+        assert hit_dtd == False
+
+        # there might be ways to make it vuln, but I did not investigate futher.
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/poc/flag b/python/ql/test/experimental/library-tests/frameworks/XML/poc/flag
new file mode 100644
index 00000000000..45c9436ee9f
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/poc/flag
@@ -0,0 +1 @@
+SECRET_FLAG
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/poc/this-dir-is-not-extracted b/python/ql/test/experimental/library-tests/frameworks/XML/poc/this-dir-is-not-extracted
new file mode 100644
index 00000000000..b1925ade1d3
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/poc/this-dir-is-not-extracted
@@ -0,0 +1 @@
+just FYI
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/xml_dom.py b/python/ql/test/experimental/library-tests/frameworks/XML/xml_dom.py
new file mode 100644
index 00000000000..7dce29fc7b9
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/xml_dom.py
@@ -0,0 +1,31 @@
+from io import StringIO
+import xml.dom.minidom
+import xml.dom.pulldom
+import xml.sax
+
+x = "some xml"
+
+# minidom
+xml.dom.minidom.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.dom.minidom.parse(file=StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.dom.minidom.parseString(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.dom.minidom.parseString(string=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+
+# pulldom
+xml.dom.pulldom.parse(StringIO(x))['START_DOCUMENT'][1] # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.dom.pulldom.parse(stream_or_string=StringIO(x))['START_DOCUMENT'][1] # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.dom.pulldom.parseString(x)['START_DOCUMENT'][1] # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.dom.pulldom.parseString(string=x)['START_DOCUMENT'][1] # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+
+# These are based on SAX parses, and you can specify your own, so you can expose yourself to XXE (yay/)
+parser = xml.sax.make_parser()
+parser.setFeature(xml.sax.handler.feature_external_ges, True)
+xml.dom.minidom.parse(StringIO(x), parser) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
+xml.dom.minidom.parse(StringIO(x), parser=parser) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
+
+xml.dom.pulldom.parse(StringIO(x), parser) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
+xml.dom.pulldom.parse(StringIO(x), parser=parser) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/xml_etree.py b/python/ql/test/experimental/library-tests/frameworks/XML/xml_etree.py
new file mode 100644
index 00000000000..df126e458e2
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/xml_etree.py
@@ -0,0 +1,45 @@
+from io import StringIO
+import xml.etree.ElementTree
+
+x = "some xml"
+
+# Parsing in different ways
+xml.etree.ElementTree.fromstring(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.etree.ElementTree.fromstring(text=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.etree.ElementTree.fromstringlist([x]) # $ input=List vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.etree.ElementTree.fromstringlist(sequence=[x]) # $ input=List vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.etree.ElementTree.XML(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.etree.ElementTree.XML(text=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.etree.ElementTree.XMLID(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.etree.ElementTree.XMLID(text=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.etree.ElementTree.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.etree.ElementTree.parse(source=StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.etree.ElementTree.iterparse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.etree.ElementTree.iterparse(source=StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+
+# With parsers (no options available to disable/enable security features)
+parser = xml.etree.ElementTree.XMLParser()
+xml.etree.ElementTree.fromstring(x, parser=parser) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+# manual use of feed method
+parser = xml.etree.ElementTree.XMLParser()
+parser.feed(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+parser.feed(data=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+parser.close()
+
+# manual use of feed method on XMLPullParser
+parser = xml.etree.ElementTree.XMLPullParser()
+parser.feed(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+parser.feed(data=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+parser.close()
+
+# note: it's technically possible to use the thing wrapper func `fromstring` with an
+# `lxml` parser, and thereby change what vulnerabilities you are exposed to.. but it
+# seems very unlikely that anyone would do this, so we have intentionally not added any
+# tests for this.
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/xml_sax.py b/python/ql/test/experimental/library-tests/frameworks/XML/xml_sax.py
new file mode 100644
index 00000000000..158e62ffae6
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/xml_sax.py
@@ -0,0 +1,64 @@
+from io import StringIO
+import xml.sax
+
+x = "some xml"
+
+class MainHandler(xml.sax.ContentHandler):
+    def __init__(self):
+        self._result = []
+
+    def characters(self, data):
+        self._result.append(data)
+
+xml.sax.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.sax.parse(source=StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+xml.sax.parseString(x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+xml.sax.parseString(string=x) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+parser = xml.sax.make_parser()
+parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+parser.parse(source=StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+# You can make it vuln to both XXE and DTD retrieval by setting this flag
+# see https://docs.python.org/3/library/xml.sax.handler.html#xml.sax.handler.feature_external_ges
+parser = xml.sax.make_parser()
+parser.setFeature(xml.sax.handler.feature_external_ges, True)
+parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
+
+parser = xml.sax.make_parser()
+parser.setFeature(xml.sax.handler.feature_external_ges, False)
+parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+# Forward Type Tracking test
+def func(cond):
+    parser = xml.sax.make_parser()
+    if cond:
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+        parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
+    else:
+        parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+# make it vuln, then making it safe
+# a bit of an edge-case, but is nice to be able to handle.
+parser = xml.sax.make_parser()
+parser.setFeature(xml.sax.handler.feature_external_ges, True)
+parser.setFeature(xml.sax.handler.feature_external_ges, False)
+parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='Quadratic Blowup'
+
+def check_conditional_assignment(cond):
+    parser = xml.sax.make_parser()
+    if cond:
+        parser.setFeature(xml.sax.handler.feature_external_ges, True)
+    else:
+        parser.setFeature(xml.sax.handler.feature_external_ges, False)
+    parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
+
+def check_conditional_assignment2(cond):
+    parser = xml.sax.make_parser()
+    if cond:
+        flag_value = True
+    else:
+        flag_value = False
+    parser.setFeature(xml.sax.handler.feature_external_ges, flag_value)
+    parser.parse(StringIO(x)) # $ input=StringIO(..) vuln='Billion Laughs' vuln='DTD retrieval' vuln='Quadratic Blowup' vuln='XXE'
diff --git a/python/ql/test/experimental/library-tests/frameworks/XML/xmltodict.py b/python/ql/test/experimental/library-tests/frameworks/XML/xmltodict.py
new file mode 100644
index 00000000000..473e51c9fe6
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/frameworks/XML/xmltodict.py
@@ -0,0 +1,8 @@
+import xmltodict
+
+x = "some xml"
+
+xmltodict.parse(x) # $ input=x
+xmltodict.parse(xml_input=x) # $ input=x
+
+xmltodict.parse(x, disable_entities=False) # $ input=x vuln='Billion Laughs' vuln='Quadratic Blowup'
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-611/SimpleXmlRpcServer.expected b/python/ql/test/experimental/query-tests/Security/CWE-611/SimpleXmlRpcServer.expected
new file mode 100644
index 00000000000..4a08d61c47a
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/SimpleXmlRpcServer.expected
@@ -0,0 +1 @@
+| xmlrpc_server.py:7:10:7:48 | ControlFlowNode for SimpleXMLRPCServer() | SimpleXMLRPCServer is vulnerable to: Billion Laughs, Quadratic Blowup. |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-611/SimpleXmlRpcServer.qlref b/python/ql/test/experimental/query-tests/Security/CWE-611/SimpleXmlRpcServer.qlref
new file mode 100644
index 00000000000..a0b30e6d69b
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/SimpleXmlRpcServer.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE-611/SimpleXmlRpcServer.ql
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-611/XmlEntityInjection.expected b/python/ql/test/experimental/query-tests/Security/CWE-611/XmlEntityInjection.expected
new file mode 100644
index 00000000000..25594b4ddaa
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/XmlEntityInjection.expected
@@ -0,0 +1,27 @@
+edges
+| test.py:8:19:8:25 | ControlFlowNode for request | test.py:8:19:8:30 | ControlFlowNode for Attribute |
+| test.py:8:19:8:30 | ControlFlowNode for Attribute | test.py:8:19:8:45 | ControlFlowNode for Subscript |
+| test.py:8:19:8:45 | ControlFlowNode for Subscript | test.py:9:34:9:44 | ControlFlowNode for xml_content |
+| test.py:13:19:13:25 | ControlFlowNode for request | test.py:13:19:13:30 | ControlFlowNode for Attribute |
+| test.py:13:19:13:30 | ControlFlowNode for Attribute | test.py:13:19:13:45 | ControlFlowNode for Subscript |
+| test.py:13:19:13:45 | ControlFlowNode for Subscript | test.py:15:34:15:44 | ControlFlowNode for xml_content |
+| test.py:19:19:19:25 | ControlFlowNode for request | test.py:19:19:19:30 | ControlFlowNode for Attribute |
+| test.py:19:19:19:30 | ControlFlowNode for Attribute | test.py:19:19:19:45 | ControlFlowNode for Subscript |
+| test.py:19:19:19:45 | ControlFlowNode for Subscript | test.py:30:34:30:44 | ControlFlowNode for xml_content |
+nodes
+| test.py:8:19:8:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test.py:8:19:8:30 | ControlFlowNode for Attribute | semmle.label | ControlFlowNode for Attribute |
+| test.py:8:19:8:45 | ControlFlowNode for Subscript | semmle.label | ControlFlowNode for Subscript |
+| test.py:9:34:9:44 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
+| test.py:13:19:13:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test.py:13:19:13:30 | ControlFlowNode for Attribute | semmle.label | ControlFlowNode for Attribute |
+| test.py:13:19:13:45 | ControlFlowNode for Subscript | semmle.label | ControlFlowNode for Subscript |
+| test.py:15:34:15:44 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
+| test.py:19:19:19:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
+| test.py:19:19:19:30 | ControlFlowNode for Attribute | semmle.label | ControlFlowNode for Attribute |
+| test.py:19:19:19:45 | ControlFlowNode for Subscript | semmle.label | ControlFlowNode for Subscript |
+| test.py:30:34:30:44 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
+subpaths
+#select
+| test.py:9:34:9:44 | ControlFlowNode for xml_content | test.py:8:19:8:25 | ControlFlowNode for request | test.py:9:34:9:44 | ControlFlowNode for xml_content | $@ XML input is constructed from a $@ and is vulnerable to: XXE. | test.py:9:34:9:44 | ControlFlowNode for xml_content | This | test.py:8:19:8:25 | ControlFlowNode for request | user-provided value |
+| test.py:30:34:30:44 | ControlFlowNode for xml_content | test.py:19:19:19:25 | ControlFlowNode for request | test.py:30:34:30:44 | ControlFlowNode for xml_content | $@ XML input is constructed from a $@ and is vulnerable to: Billion Laughs, DTD retrieval, Quadratic Blowup, XXE. | test.py:30:34:30:44 | ControlFlowNode for xml_content | This | test.py:19:19:19:25 | ControlFlowNode for request | user-provided value |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-611/XmlEntityInjection.qlref b/python/ql/test/experimental/query-tests/Security/CWE-611/XmlEntityInjection.qlref
new file mode 100644
index 00000000000..36a7c8845fb
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/XmlEntityInjection.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE-611/XmlEntityInjection.ql
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-611/test.py b/python/ql/test/experimental/query-tests/Security/CWE-611/test.py
new file mode 100644
index 00000000000..d9181c4cf34
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/test.py
@@ -0,0 +1,30 @@
+from flask import Flask, request
+import lxml.etree
+
+app = Flask(__name__)
+
+@app.route("/vuln-handler")
+def vuln_handler():
+    xml_content = request.args['xml_content']
+    return lxml.etree.fromstring(xml_content).text
+
+@app.route("/safe-handler")
+def safe_handler():
+    xml_content = request.args['xml_content']
+    parser = lxml.etree.XMLParser(resolve_entities=False)
+    return lxml.etree.fromstring(xml_content, parser=parser).text
+
+@app.route("/super-vuln-handler")
+def super_vuln_handler():
+    xml_content = request.args['xml_content']
+    parser = lxml.etree.XMLParser(
+        # allows XXE
+        resolve_entities=True,
+        # allows remote XXE
+        no_network=False,
+        # together with `no_network=False`, allows DTD-retrival
+        load_dtd=True,
+        # allows DoS attacks
+        huge_tree=True,
+    )
+    return lxml.etree.fromstring(xml_content, parser=parser).text
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-611/xmlrpc_server.py b/python/ql/test/experimental/query-tests/Security/CWE-611/xmlrpc_server.py
new file mode 100644
index 00000000000..83c18b549b3
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/xmlrpc_server.py
@@ -0,0 +1,12 @@
+from xmlrpc.server import SimpleXMLRPCServer
+
+def foo(n: str):
+    print("foo called with arg:", n, type(n))
+    return "ok"
+
+server = SimpleXMLRPCServer(("127.0.0.1", 8000))
+server.register_function(foo, "foo")
+server.serve_forever()
+
+# normal: curl 127.0.0.1:8000 --data-raw '<?xml version="1.0"?><methodCall><methodName>foo</methodName><params><param><value>42</value></param></params></methodCall>'
+# billion_laughs: curl 127.0.0.1:8000 --data-raw '<?xml version="1.0"?><!DOCTYPE lolz [<!ENTITY lol "lol"><!ELEMENT lolz (#PCDATA)><!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;"><!ENTITY lol2 "&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;"><!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;"><!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;"><!ENTITY lol5 "&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;"><!ENTITY lol6 "&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;"><!ENTITY lol7 "&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;"><!ENTITY lol8 "&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;"><!ENTITY lol9 "&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;">]><methodCall><methodName>foo</methodName><params><param><value>&lol9;</value></param></params></methodCall>'
diff --git a/python/ql/test/library-tests/PointsTo/customise/test.expected b/python/ql/test/library-tests/PointsTo/customise/test.expected
deleted file mode 100644
index 009572ad1c5..00000000000
--- a/python/ql/test/library-tests/PointsTo/customise/test.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (test.ql:9,27-51)
-| 9 | ControlFlowNode for has_type_int | Function has_type_int | builtin-class function |
-| 9 | ControlFlowNode for has_type_int() | has_type_int() | builtin-class int |
-| 9 | ControlFlowNode for x | has_type_int() | builtin-class int |
-| 10 | ControlFlowNode for has_type_float | Function has_type_float | builtin-class function |
-| 10 | ControlFlowNode for has_type_float() | has_type_float() | builtin-class float |
-| 10 | ControlFlowNode for y | has_type_float() | builtin-class float |
-| 11 | ControlFlowNode for Tuple | Tuple | builtin-class tuple |
-| 11 | ControlFlowNode for x | has_type_int() | builtin-class int |
-| 11 | ControlFlowNode for y | has_type_float() | builtin-class float |
diff --git a/python/ql/test/library-tests/PointsTo/customise/test.py b/python/ql/test/library-tests/PointsTo/customise/test.py
deleted file mode 100644
index f6aef15a9ff..00000000000
--- a/python/ql/test/library-tests/PointsTo/customise/test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-def has_type_int():
-    return untaceable()
-
-def has_type_float():
-    return untaceable2()
-
-def test():
-    #Ignore before this comment
-    x = has_type_int()
-    y = has_type_float()
-    return x, y
\ No newline at end of file
diff --git a/python/ql/test/library-tests/PointsTo/customise/test.ql b/python/ql/test/library-tests/PointsTo/customise/test.ql
deleted file mode 100644
index f101e4f2a5d..00000000000
--- a/python/ql/test/library-tests/PointsTo/customise/test.ql
+++ /dev/null
@@ -1,35 +0,0 @@
-import python
-import semmle.python.types.Extensions
-
-/*
- * Customise: Claim any function called has_type_XXX return any class
- * whose name matches XXX
- */
-
-class HasTypeFact extends CustomPointsToOriginFact {
-  HasTypeFact() {
-    exists(FunctionObject func, string name |
-      func.getACall() = this and
-      name = func.getName() and
-      name.matches("has\\_type\\_%")
-    )
-  }
-
-  override predicate pointsTo(Object value, ClassObject cls) {
-    exists(FunctionObject func, string name |
-      func.getACall() = this and
-      name = func.getName() and
-      name.matches("has\\_type\\_%")
-    |
-      cls.getName() = name.suffix("has_type_".length())
-    ) and
-    value = this
-  }
-}
-
-from int line, ControlFlowNode f, Object o, ClassObject c
-where
-  f.getLocation().getStartLine() = line and
-  exists(Comment ct | ct.getLocation().getStartLine() < line) and
-  f.refersTo(o, c, _)
-select line, f.toString(), o.toString(), c.toString()
diff --git a/python/ql/test/library-tests/PointsTo/extensions/Extend.expected b/python/ql/test/library-tests/PointsTo/extensions/Extend.expected
deleted file mode 100644
index ddd6e90582c..00000000000
--- a/python/ql/test/library-tests/PointsTo/extensions/Extend.expected
+++ /dev/null
@@ -1,23 +0,0 @@
-WARNING: Type CustomPointsToAttribute has been deprecated and may be removed in future (Extend.ql:22,34-57)
-WARNING: Type CustomPointsToObjectFact has been deprecated and may be removed in future (Extend.ql:38,32-56)
-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (Extend.ql:5,28-52)
-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (Extend.ql:49,38-62)
-| test.py:4:1:4:3 | ControlFlowNode for one | int 1 |
-| test.py:5:1:5:3 | ControlFlowNode for two | int 2 |
-| test.py:8:1:8:1 | ControlFlowNode for IntegerLiteral | int 1 |
-| test.py:8:1:8:11 | ControlFlowNode for Tuple | Tuple |
-| test.py:8:3:8:3 | ControlFlowNode for IntegerLiteral | int 2 |
-| test.py:8:5:8:5 | ControlFlowNode for IntegerLiteral | int 3 |
-| test.py:8:7:8:7 | ControlFlowNode for IntegerLiteral | int 4 |
-| test.py:8:9:8:9 | ControlFlowNode for IntegerLiteral | int 5 |
-| test.py:8:11:8:11 | ControlFlowNode for IntegerLiteral | int 6 |
-| test.py:10:1:10:2 | ControlFlowNode for a3 | int 3 |
-| test.py:10:6:10:7 | ControlFlowNode for Tuple | Tuple |
-| test.py:10:6:10:13 | ControlFlowNode for Attribute | int 3 |
-| test.py:11:1:11:2 | ControlFlowNode for a4 | int 4 |
-| test.py:11:6:11:10 | ControlFlowNode for False | bool False |
-| test.py:11:6:11:15 | ControlFlowNode for Attribute | int 4 |
-| test.py:13:1:13:2 | ControlFlowNode for a3 | int 3 |
-| test.py:14:1:14:2 | ControlFlowNode for a4 | int 4 |
-| test.py:16:1:16:4 | ControlFlowNode for five | int 5 |
-| test.py:17:1:17:3 | ControlFlowNode for six | int 6 |
diff --git a/python/ql/test/library-tests/PointsTo/extensions/Extend.ql b/python/ql/test/library-tests/PointsTo/extensions/Extend.ql
deleted file mode 100644
index 078b925a1df..00000000000
--- a/python/ql/test/library-tests/PointsTo/extensions/Extend.ql
+++ /dev/null
@@ -1,59 +0,0 @@
-import python
-import semmle.python.pointsto.PointsTo
-private import semmle.python.types.Extensions
-
-class CfgExtension extends CustomPointsToOriginFact {
-  CfgExtension() {
-    this.(NameNode).getId() = "one"
-    or
-    this.(NameNode).getId() = "two"
-  }
-
-  override predicate pointsTo(Object value, ClassObject cls) {
-    cls = theIntType() and
-    (
-      this.(NameNode).getId() = "one" and value.(NumericObject).intValue() = 1
-      or
-      this.(NameNode).getId() = "two" and value.(NumericObject).intValue() = 2
-    )
-  }
-}
-
-class AttributeExtension extends CustomPointsToAttribute {
-  AttributeExtension() { this = this }
-
-  override predicate attributePointsTo(
-    string name, Object value, ClassObject cls, ControlFlowNode origin
-  ) {
-    cls = theIntType() and
-    origin = any(Module m).getEntryNode() and
-    (
-      name = "three" and value.(NumericObject).intValue() = 3
-      or
-      name = "four" and value.(NumericObject).intValue() = 4
-    )
-  }
-}
-
-class NoClassExtension extends CustomPointsToObjectFact {
-  NoClassExtension() { this = this }
-
-  override predicate pointsTo(Object value) {
-    this.(NameNode).getId() = "five" and value.(NumericObject).intValue() = 5
-    or
-    this.(NameNode).getId() = "six" and value.(NumericObject).intValue() = 6
-  }
-}
-
-/* Check that we can use old API without causing non-monotonic recursion */
-class RecurseIntoOldPointsTo extends CustomPointsToOriginFact {
-  RecurseIntoOldPointsTo() { PointsTo::points_to(this, _, unknownValue(), _, _) }
-
-  override predicate pointsTo(Object value, ClassObject cls) {
-    value = unknownValue() and cls = theUnknownType()
-  }
-}
-
-from ControlFlowNode f, Object o
-where f.getLocation().getFile().getBaseName() = "test.py" and f.refersTo(o)
-select f, o.toString()
diff --git a/python/ql/test/library-tests/PointsTo/extensions/test.py b/python/ql/test/library-tests/PointsTo/extensions/test.py
deleted file mode 100644
index 7422cce15d2..00000000000
--- a/python/ql/test/library-tests/PointsTo/extensions/test.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#Magical values
-
-one
-two
-
-#Make sure values exist in DB
-1,2,3,4,5,6
-
-a3 = ().three
-a4 = False.four
-
-a3
-a4
-
-five
-six
diff --git a/python/ql/test/library-tests/PointsTo/general/interesting.qll b/python/ql/test/library-tests/PointsTo/general/interesting.qll
index 728738d65bc..58a8ebf03dc 100644
--- a/python/ql/test/library-tests/PointsTo/general/interesting.qll
+++ b/python/ql/test/library-tests/PointsTo/general/interesting.qll
@@ -4,7 +4,7 @@ predicate of_interest(ControlFlowNode n, int line) {
   exists(Location l, File f | l = n.getLocation() |
     line = l.getStartLine() and
     f = l.getFile() and
-    f.getName().matches("%test.py%") and
+    f.getAbsolutePath().matches("%test.py%") and
     exists(Comment c |
       c.getLocation().getStartLine() < line and
       c.getLocation().getFile() = f
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/Mro.ql b/python/ql/test/library-tests/PointsTo/inheritance/Mro.ql
index 2627eac8e38..9ea0136065a 100644
--- a/python/ql/test/library-tests/PointsTo/inheritance/Mro.ql
+++ b/python/ql/test/library-tests/PointsTo/inheritance/Mro.ql
@@ -2,7 +2,7 @@ import python
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.pointsto.PointsTo
 
-/** Make unknown type visible */
+/** An unknown type. Not usually visible. */
 class UnknownType extends UnknownClassInternal {
   override string toString() { result = "*UNKNOWN TYPE" }
 }
diff --git a/python/ql/test/library-tests/PointsTo/metaclass/Mro.ql b/python/ql/test/library-tests/PointsTo/metaclass/Mro.ql
index 0f48b7a1034..9a0f8a6569a 100644
--- a/python/ql/test/library-tests/PointsTo/metaclass/Mro.ql
+++ b/python/ql/test/library-tests/PointsTo/metaclass/Mro.ql
@@ -2,7 +2,7 @@ import python
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.pointsto.PointsTo
 
-/** Make unknown type visible */
+/** An unknown type. Not usually visible. */
 class UnknownType extends UnknownClassInternal {
   override string toString() { result = "*UNKNOWN TYPE" }
 }
diff --git a/python/ql/test/library-tests/PointsTo/metaclass/test.ql b/python/ql/test/library-tests/PointsTo/metaclass/test.ql
index a0d47fa9717..d08f4e37fa6 100644
--- a/python/ql/test/library-tests/PointsTo/metaclass/test.ql
+++ b/python/ql/test/library-tests/PointsTo/metaclass/test.ql
@@ -1,7 +1,7 @@
 import python
 private import semmle.python.objects.ObjectInternal
 
-/** Make unknown type visible */
+/** An unknown type. Not usually visible. */
 class UnknownType extends UnknownClassInternal {
   override string toString() { result = "*UNKNOWN TYPE" }
 }
diff --git a/python/ql/test/library-tests/PointsTo/new/SSA.expected b/python/ql/test/library-tests/PointsTo/new/SSA.expected
index 56ec51dfcd5..9914a4eeec7 100644
--- a/python/ql/test/library-tests/PointsTo/new/SSA.expected
+++ b/python/ql/test/library-tests/PointsTo/new/SSA.expected
@@ -1,4 +1,3 @@
-WARNING: Predicate ssa_variable_points_to has been deprecated and may be removed in future (SSA.ql:10,3-35)
 | __init__.py:0 | __name___0 = ScopeEntryDefinition | 'code' | builtin-class str |
 | __init__.py:0 | __name___0 = ScopeEntryDefinition | 'code.package' | builtin-class str |
 | __init__.py:0 | __name___0 = ScopeEntryDefinition | 'code.test_package' | builtin-class str |
diff --git a/python/ql/test/library-tests/PointsTo/new/SSA.ql b/python/ql/test/library-tests/PointsTo/new/SSA.ql
index b8f2c4cf54b..7b41f3c427e 100644
--- a/python/ql/test/library-tests/PointsTo/new/SSA.ql
+++ b/python/ql/test/library-tests/PointsTo/new/SSA.ql
@@ -3,10 +3,21 @@ private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.PointsToContext
 import Util
 
+predicate ssa_variable_points_to(
+  EssaVariable var, PointsToContext context, Object obj, ClassObject cls, @py_object origin
+) {
+  exists(ObjectInternal value |
+    PointsToInternal::variablePointsTo(var, context, value, origin) and
+    cls = value.getClass().getSource()
+  |
+    obj = value.getSource()
+  )
+}
+
 from EssaVariable v, EssaDefinition def, Object o, ClassObject cls
 where
   def = v.getDefinition() and
   not v.getSourceVariable() instanceof SpecialSsaSourceVariable and
-  PointsTo::ssa_variable_points_to(v, _, o, cls, _)
+  ssa_variable_points_to(v, _, o, cls, _)
 select locate(def.getLocation(), "abcdegjqmns_"),
   v.getRepresentation() + " = " + def.getRepresentation(), repr(o), repr(cls)
diff --git a/python/ql/test/library-tests/examples/custom-sanitizer/Taint.qll b/python/ql/test/library-tests/examples/custom-sanitizer/Taint.qll
index 343fc976503..343caa1131f 100644
--- a/python/ql/test/library-tests/examples/custom-sanitizer/Taint.qll
+++ b/python/ql/test/library-tests/examples/custom-sanitizer/Taint.qll
@@ -13,11 +13,12 @@ class SimpleSource extends TaintSource {
 class MySimpleSanitizer extends Sanitizer {
   MySimpleSanitizer() { this = "MySimpleSanitizer" }
 
-  /**
+  /*
    * The test `if is_safe(arg):` sanitizes `arg` on its `true` edge.
    *
    * Can't handle `if not is_safe(arg):` :\ that's why it's called MySimpleSanitizer
    */
+
   override predicate sanitizingEdge(TaintKind taint, PyEdgeRefinement test) {
     taint instanceof ExternalStringKind and
     exists(CallNode call | test.getTest() = call and test.getSense() = true |
@@ -30,7 +31,7 @@ class MySimpleSanitizer extends Sanitizer {
 class MySanitizerHandlingNot extends Sanitizer {
   MySanitizerHandlingNot() { this = "MySanitizerHandlingNot" }
 
-  /** The test `if is_safe(arg):` sanitizes `arg` on its `true` edge. */
+  /** Holds if the test `if is_safe(arg):` sanitizes `arg` on its `true` edge. */
   override predicate sanitizingEdge(TaintKind taint, PyEdgeRefinement test) {
     taint instanceof ExternalStringKind and
     clears_taint_on_true(test.getTest(), test.getSense(), test)
diff --git a/python/ql/test/library-tests/frameworks/aiohttp/client_request.py b/python/ql/test/library-tests/frameworks/aiohttp/client_request.py
new file mode 100644
index 00000000000..8422853e61b
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/aiohttp/client_request.py
@@ -0,0 +1,16 @@
+import aiohttp
+import asyncio
+
+s = aiohttp.ClientSession()
+resp = s.request("method", "url") # $ clientRequestUrlPart="url"
+resp = s.request("method", url="url") # $ clientRequestUrlPart="url"
+
+with aiohttp.ClientSession() as session:
+    resp = session.get("url") # $ clientRequestUrlPart="url"
+    resp = session.request(method="GET", url="url") # $ clientRequestUrlPart="url"
+
+# other methods than GET
+s = aiohttp.ClientSession()
+resp = s.post("url") # $ clientRequestUrlPart="url"
+resp = s.patch("url") # $ clientRequestUrlPart="url"
+resp = s.options("url") # $ clientRequestUrlPart="url"
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/httpx/test.py b/python/ql/test/library-tests/frameworks/httpx/test.py
new file mode 100644
index 00000000000..cf519a7ac1a
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/httpx/test.py
@@ -0,0 +1,24 @@
+import httpx
+
+httpx.get("url") # $ clientRequestUrlPart="url"
+httpx.post("url") # $ clientRequestUrlPart="url"
+httpx.patch("url") # $ clientRequestUrlPart="url"
+httpx.options("url") # $ clientRequestUrlPart="url"
+httpx.request("method", url="url") # $ clientRequestUrlPart="url"
+httpx.stream("method", url="url") # $ clientRequestUrlPart="url"
+
+client = httpx.Client()
+response = client.get("url") # $ clientRequestUrlPart="url"
+response = client.post("url") # $ clientRequestUrlPart="url"
+response = client.patch("url") # $ clientRequestUrlPart="url"
+response = client.options("url") # $ clientRequestUrlPart="url"
+response = client.request("method", url="url") # $ clientRequestUrlPart="url"
+response = client.stream("method", url="url") # $ clientRequestUrlPart="url"
+
+client = httpx.AsyncClient()
+response = client.get("url") # $ clientRequestUrlPart="url"
+response = client.post("url") # $ clientRequestUrlPart="url"
+response = client.patch("url") # $ clientRequestUrlPart="url"
+response = client.options("url") # $ clientRequestUrlPart="url"
+response = client.request("method", url="url") # $ clientRequestUrlPart="url"
+response = client.stream("method", url="url") # $ clientRequestUrlPart="url"
diff --git a/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/libtaxii/test.py b/python/ql/test/library-tests/frameworks/libtaxii/test.py
new file mode 100644
index 00000000000..a7cdd4e3c0e
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/libtaxii/test.py
@@ -0,0 +1,4 @@
+from libtaxii.common import parse
+
+result = parse("url", allow_url=True) # $ clientRequestUrlPart="url"
+result = parse(s="url", allow_url=True) # $ clientRequestUrlPart="url"
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/pycurl/test.py b/python/ql/test/library-tests/frameworks/pycurl/test.py
new file mode 100644
index 00000000000..055152d7b2f
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/pycurl/test.py
@@ -0,0 +1,4 @@
+import pycurl
+
+c = pycurl.Curl()
+c.setopt(pycurl.URL, "url") # $ clientRequestUrlPart="url"
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py2/urllib2.py b/python/ql/test/library-tests/frameworks/stdlib-py2/urllib2.py
new file mode 100644
index 00000000000..77eed7df94f
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib-py2/urllib2.py
@@ -0,0 +1,7 @@
+import urllib2
+
+resp = urllib2.Request("url") # $ clientRequestUrlPart="url"
+resp = urllib2.Request(url="url") # $ clientRequestUrlPart="url"
+
+resp = urllib2.urlopen("url") # $ clientRequestUrlPart="url"
+resp = urllib2.urlopen(url="url") # $ clientRequestUrlPart="url"
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/stdlib/urllib.py b/python/ql/test/library-tests/frameworks/stdlib/urllib.py
new file mode 100644
index 00000000000..2371052e9a6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/stdlib/urllib.py
@@ -0,0 +1,7 @@
+from urllib.request import Request, urlopen
+
+Request("url") # $ clientRequestUrlPart="url"
+Request(url="url") # $ clientRequestUrlPart="url"
+
+urlopen("url") # $ clientRequestUrlPart="url"
+urlopen(url="url") # $ clientRequestUrlPart="url"
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/urllib3/test.py b/python/ql/test/library-tests/frameworks/urllib3/test.py
new file mode 100644
index 00000000000..921c100ef95
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/urllib3/test.py
@@ -0,0 +1,29 @@
+import urllib3
+
+pool = urllib3.PoolManager()
+
+resp = pool.request("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.request("method", url="url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", url="url") # $ clientRequestUrlPart="url"
+
+pool = urllib3.ProxyManager("http://proxy")
+
+resp = pool.request("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.request("method", url="url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", url="url") # $ clientRequestUrlPart="url"
+
+pool = urllib3.HTTPConnectionPool("host")
+
+resp = pool.request("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.request("method", url="url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", url="url") # $ clientRequestUrlPart="url"
+
+pool = urllib3.HTTPSConnectionPool("host")
+
+resp = pool.request("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.request("method", url="url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", "url") # $ clientRequestUrlPart="url"
+resp = pool.urlopen("method", url="url") # $ clientRequestUrlPart="url"
diff --git a/python/ql/test/library-tests/locations/implicit_concatenation/part_locations.ql b/python/ql/test/library-tests/locations/implicit_concatenation/part_locations.ql
index 07e339bc0f1..fa25cb671c9 100644
--- a/python/ql/test/library-tests/locations/implicit_concatenation/part_locations.ql
+++ b/python/ql/test/library-tests/locations/implicit_concatenation/part_locations.ql
@@ -1,9 +1,5 @@
 import python
 
-class ImplicitConcat extends StrConst {
-  ImplicitConcat() { exists(this.getAnImplicitlyConcatenatedPart()) }
-}
-
 from StringPart s
 select s.getLocation().getStartLine(), s.getText(), s.getLocation().getStartColumn(),
   s.getLocation().getEndColumn()
diff --git a/python/ql/test/library-tests/locations/implicit_concatenation/parts.ql b/python/ql/test/library-tests/locations/implicit_concatenation/parts.ql
index 0637e72df6e..992f695663e 100644
--- a/python/ql/test/library-tests/locations/implicit_concatenation/parts.ql
+++ b/python/ql/test/library-tests/locations/implicit_concatenation/parts.ql
@@ -1,9 +1,5 @@
 import python
 
-class ImplicitConcat extends StrConst {
-  ImplicitConcat() { exists(this.getAnImplicitlyConcatenatedPart()) }
-}
-
 from StrConst s, StringPart part, int n
 where part = s.getImplicitlyConcatenatedPart(n)
 select s.getLocation().getStartLine(), s.getText(), n, part.getText()
diff --git a/python/ql/test/library-tests/taint/dataflow/Config.qll b/python/ql/test/library-tests/taint/dataflow/Config.qll
index a02d2e0227c..1ab008d2ac4 100644
--- a/python/ql/test/library-tests/taint/dataflow/Config.qll
+++ b/python/ql/test/library-tests/taint/dataflow/Config.qll
@@ -1,15 +1,22 @@
 import python
 import semmle.python.dataflow.DataFlow
 
-class TestConfiguration extends DataFlow::Configuration {
+class TestConfiguration extends TaintTracking::Configuration {
   TestConfiguration() { this = "Test configuration" }
 
-  override predicate isSource(ControlFlowNode source) { source.(NameNode).getId() = "SOURCE" }
+  override predicate isSource(DataFlow::Node source, TaintKind kind) {
+    source.asCfgNode().(NameNode).getId() = "SOURCE" and kind instanceof DataFlowType
+  }
 
-  override predicate isSink(ControlFlowNode sink) {
+  override predicate isSink(DataFlow::Node sink, TaintKind kind) {
     exists(CallNode call |
       call.getFunction().(NameNode).getId() = "SINK" and
-      sink = call.getAnArg()
-    )
+      sink.asCfgNode() = call.getAnArg()
+    ) and
+    kind instanceof DataFlowType
   }
 }
+
+private class DataFlowType extends TaintKind {
+  DataFlowType() { this = "Data flow" }
+}
diff --git a/python/ql/test/library-tests/taint/dataflow/Dataflow.ql b/python/ql/test/library-tests/taint/dataflow/Dataflow.ql
index ced8b9a7c25..bb27947d0f5 100644
--- a/python/ql/test/library-tests/taint/dataflow/Dataflow.ql
+++ b/python/ql/test/library-tests/taint/dataflow/Dataflow.ql
@@ -2,5 +2,8 @@ import python
 import Config
 
 from TestConfiguration config, ControlFlowNode src, ControlFlowNode sink
-where config.hasFlow(src, sink)
+where
+  config
+      .hasSimpleFlow(any(DataFlow::Node s | s.asCfgNode() = src),
+        any(DataFlow::Node s | s.asCfgNode() = sink))
 select src, sink
diff --git a/python/ql/test/library-tests/taint/dataflow/TestNode.expected b/python/ql/test/library-tests/taint/dataflow/TestNode.expected
index 192534e6c5c..87a04ded36d 100644
--- a/python/ql/test/library-tests/taint/dataflow/TestNode.expected
+++ b/python/ql/test/library-tests/taint/dataflow/TestNode.expected
@@ -1,59 +1,58 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:5,77-84)
-| Taint Data flow | test.py:3 | SOURCE |  |
-| Taint Data flow | test.py:6 | SOURCE |  |
-| Taint Data flow | test.py:7 | s |  |
-| Taint Data flow | test.py:10 | SOURCE |  |
-| Taint Data flow | test.py:12 | arg | p0 = Data flow |
-| Taint Data flow | test.py:13 | arg | p0 = Data flow |
-| Taint Data flow | test.py:16 | source() |  |
-| Taint Data flow | test.py:17 | t |  |
-| Taint Data flow | test.py:20 | SOURCE |  |
-| Taint Data flow | test.py:21 | t |  |
-| Taint Data flow | test.py:24 | source() |  |
-| Taint Data flow | test.py:25 | t |  |
-| Taint Data flow | test.py:31 | SOURCE |  |
-| Taint Data flow | test.py:37 | SOURCE |  |
-| Taint Data flow | test.py:41 | t |  |
-| Taint Data flow | test.py:44 | source() |  |
-| Taint Data flow | test.py:46 | arg | p0 = Data flow |
-| Taint Data flow | test.py:47 | arg | p0 = Data flow |
-| Taint Data flow | test.py:49 | arg | p1 = Data flow |
-| Taint Data flow | test.py:51 | arg | p1 = Data flow |
-| Taint Data flow | test.py:54 | source2() |  |
-| Taint Data flow | test.py:55 | t |  |
-| Taint Data flow | test.py:62 | SOURCE |  |
-| Taint Data flow | test.py:63 | t |  |
-| Taint Data flow | test.py:67 | SOURCE |  |
-| Taint Data flow | test.py:70 | t |  |
-| Taint Data flow | test.py:72 | arg | p0 = Data flow |
-| Taint Data flow | test.py:73 | arg | p0 = Data flow |
-| Taint Data flow | test.py:76 | SOURCE |  |
-| Taint Data flow | test.py:77 | hub() |  |
-| Taint Data flow | test.py:77 | t |  |
-| Taint Data flow | test.py:78 | t |  |
-| Taint Data flow | test.py:108 | SOURCE |  |
-| Taint Data flow | test.py:112 | t |  |
-| Taint Data flow | test.py:118 | SOURCE |  |
-| Taint Data flow | test.py:120 | t |  |
-| Taint Data flow | test.py:128 | SOURCE |  |
-| Taint Data flow | test.py:129 | t |  |
-| Taint Data flow | test.py:139 | SOURCE |  |
-| Taint Data flow | test.py:140 | t |  |
-| Taint Data flow | test.py:143 | SOURCE |  |
-| Taint Data flow | test.py:144 | s |  |
-| Taint Data flow | test.py:145 | s |  |
-| Taint Data flow | test.py:148 | SOURCE |  |
-| Taint Data flow | test.py:149 | SOURCE |  |
-| Taint Data flow | test.py:158 | SOURCE |  |
-| Taint Data flow | test.py:159 | t |  |
-| Taint Data flow | test.py:160 | t |  |
-| Taint Data flow | test.py:163 | t |  |
-| Taint Data flow | test.py:166 | t |  |
-| Taint [Data flow] | test.py:148 | List |  |
-| Taint [Data flow] | test.py:150 | l |  |
-| Taint [Data flow] | test.py:154 | l |  |
-| Taint [Data flow] | test.py:154 | list() |  |
-| Taint {Data flow} | test.py:149 | Dict |  |
-| Taint {Data flow} | test.py:151 | d |  |
-| Taint {Data flow} | test.py:155 | d |  |
-| Taint {Data flow} | test.py:155 | dict() |  |
+| Taint Data flow | test.py:3 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:6 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:7 | ControlFlowNode for s |  |
+| Taint Data flow | test.py:10 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:12 | ControlFlowNode for arg | p0 = Data flow |
+| Taint Data flow | test.py:13 | ControlFlowNode for arg | p0 = Data flow |
+| Taint Data flow | test.py:16 | ControlFlowNode for source() |  |
+| Taint Data flow | test.py:17 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:20 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:21 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:24 | ControlFlowNode for source() |  |
+| Taint Data flow | test.py:25 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:31 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:37 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:41 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:44 | ControlFlowNode for source() |  |
+| Taint Data flow | test.py:46 | ControlFlowNode for arg | p0 = Data flow |
+| Taint Data flow | test.py:47 | ControlFlowNode for arg | p0 = Data flow |
+| Taint Data flow | test.py:49 | ControlFlowNode for arg | p1 = Data flow |
+| Taint Data flow | test.py:51 | ControlFlowNode for arg | p1 = Data flow |
+| Taint Data flow | test.py:54 | ControlFlowNode for source2() |  |
+| Taint Data flow | test.py:55 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:62 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:63 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:67 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:70 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:72 | ControlFlowNode for arg | p0 = Data flow |
+| Taint Data flow | test.py:73 | ControlFlowNode for arg | p0 = Data flow |
+| Taint Data flow | test.py:76 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:77 | ControlFlowNode for hub() |  |
+| Taint Data flow | test.py:77 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:78 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:108 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:112 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:118 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:120 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:128 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:129 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:139 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:140 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:143 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:144 | ControlFlowNode for s |  |
+| Taint Data flow | test.py:145 | ControlFlowNode for s |  |
+| Taint Data flow | test.py:148 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:149 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:158 | ControlFlowNode for SOURCE |  |
+| Taint Data flow | test.py:159 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:160 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:163 | ControlFlowNode for t |  |
+| Taint Data flow | test.py:166 | ControlFlowNode for t |  |
+| Taint [Data flow] | test.py:148 | ControlFlowNode for List |  |
+| Taint [Data flow] | test.py:150 | ControlFlowNode for l |  |
+| Taint [Data flow] | test.py:154 | ControlFlowNode for l |  |
+| Taint [Data flow] | test.py:154 | ControlFlowNode for list() |  |
+| Taint {Data flow} | test.py:149 | ControlFlowNode for Dict |  |
+| Taint {Data flow} | test.py:151 | ControlFlowNode for d |  |
+| Taint {Data flow} | test.py:155 | ControlFlowNode for d |  |
+| Taint {Data flow} | test.py:155 | ControlFlowNode for dict() |  |
diff --git a/python/ql/test/library-tests/taint/dataflow/TestNode.ql b/python/ql/test/library-tests/taint/dataflow/TestNode.ql
index 93b25572a52..803d81de402 100644
--- a/python/ql/test/library-tests/taint/dataflow/TestNode.ql
+++ b/python/ql/test/library-tests/taint/dataflow/TestNode.ql
@@ -2,5 +2,5 @@ import python
 import Config
 
 from TaintedNode n
-select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().getNode().toString(),
+select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().asCfgNode().toString(),
   n.getContext()
diff --git a/python/ql/test/library-tests/taint/example/DilbertConfig.qll b/python/ql/test/library-tests/taint/example/DilbertConfig.qll
index c27c3dfd103..3cdd69bb017 100644
--- a/python/ql/test/library-tests/taint/example/DilbertConfig.qll
+++ b/python/ql/test/library-tests/taint/example/DilbertConfig.qll
@@ -17,7 +17,7 @@ class Wally extends Engineer {
   Wally() { this = "Wally" }
 }
 
-/** Then the configuration */
+/** The configuration for this example. */
 class DilbertConfig extends TaintTracking::Configuration {
   DilbertConfig() { this = "Dilbert config" }
 
diff --git a/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected b/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected
index 4ee4e15cefd..b0b2a23b14b 100644
--- a/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected
+++ b/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected
@@ -1,4 +1,3 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:7,43-50)
 | test.py:10:11:10:47 | test.py:10 | MyException() | exception.kind |
 | test.py:15:25:15:25 | test.py:15 | e | exception.kind |
 | test.py:16:13:16:34 | test.py:16 | Attribute() | exception.info |
diff --git a/python/ql/test/library-tests/taint/exception_traceback/TestNode.ql b/python/ql/test/library-tests/taint/exception_traceback/TestNode.ql
index b11ef5e18e8..f3c7e98de94 100644
--- a/python/ql/test/library-tests/taint/exception_traceback/TestNode.ql
+++ b/python/ql/test/library-tests/taint/exception_traceback/TestNode.ql
@@ -4,4 +4,4 @@ import semmle.python.web.HttpResponse
 
 from TaintedNode node
 where not node.getLocation().getFile().inStdlib()
-select node.getLocation(), node.getNode().getNode().toString(), node.getTaintKind()
+select node.getLocation(), node.getNode().asAstNode().toString(), node.getTaintKind()
diff --git a/python/ql/test/library-tests/taint/extensions/TestNode.expected b/python/ql/test/library-tests/taint/extensions/TestNode.expected
index ac67500eb3e..518198220ef 100644
--- a/python/ql/test/library-tests/taint/extensions/TestNode.expected
+++ b/python/ql/test/library-tests/taint/extensions/TestNode.expected
@@ -1,4 +1,3 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:5,77-84)
 | Taint simple.test | visitor.py:10 | arg | p2 = simple.test |
 | Taint simple.test | visitor.py:13 | arg | p2 = simple.test |
 | Taint simple.test | visitor.py:18 | arg |  |
diff --git a/python/ql/test/library-tests/taint/extensions/TestNode.ql b/python/ql/test/library-tests/taint/extensions/TestNode.ql
index b884345b69a..feae4c7aa26 100644
--- a/python/ql/test/library-tests/taint/extensions/TestNode.ql
+++ b/python/ql/test/library-tests/taint/extensions/TestNode.ql
@@ -2,5 +2,5 @@ import python
 import ExtensionsLib
 
 from TaintedNode n
-select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().getNode().toString(),
+select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().asAstNode().toString(),
   n.getContext()
diff --git a/python/ql/test/library-tests/taint/extensions/TestStep.expected b/python/ql/test/library-tests/taint/extensions/TestStep.expected
index 15863a8db4e..596372ea3a0 100644
--- a/python/ql/test/library-tests/taint/extensions/TestStep.expected
+++ b/python/ql/test/library-tests/taint/extensions/TestStep.expected
@@ -1,5 +1,3 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:6,77-84)
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:8,15-22)
 | Taint simple.test | visitor.py:10 | arg | p2 = simple.test |  -->  | Taint simple.test | visitor.py:13 | arg | p2 = simple.test |
 | Taint simple.test | visitor.py:18 | arg |  |  -->  | Taint simple.test | visitor.py:19 | arg |  |
 | Taint simple.test | visitor.py:19 | arg |  |  -->  | Taint simple.test | visitor.py:26 | Attribute() |  |
diff --git a/python/ql/test/library-tests/taint/extensions/TestStep.ql b/python/ql/test/library-tests/taint/extensions/TestStep.ql
index 9defeb85b41..6105a51e82b 100644
--- a/python/ql/test/library-tests/taint/extensions/TestStep.ql
+++ b/python/ql/test/library-tests/taint/extensions/TestStep.ql
@@ -3,6 +3,6 @@ import ExtensionsLib
 
 from TaintedNode n, TaintedNode s
 where s = n.getASuccessor()
-select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().getNode().toString(),
+select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().asAstNode().toString(),
   n.getContext(), " --> ", "Taint " + s.getTaintKind(), s.getLocation().toString(),
-  s.getNode().getNode().toString(), s.getContext()
+  s.getNode().asAstNode().toString(), s.getContext()
diff --git a/python/ql/test/library-tests/taint/general/Contexts.expected b/python/ql/test/library-tests/taint/general/Contexts.expected
deleted file mode 100644
index 82be163c39c..00000000000
--- a/python/ql/test/library-tests/taint/general/Contexts.expected
+++ /dev/null
@@ -1,33 +0,0 @@
-WARNING: Type CallContext has been deprecated and may be removed in future (Contexts.ql:5,6-17)
-WARNING: Type CallContext has been deprecated and may be removed in future (Contexts.ql:7,10-21)
-| assignment.py:1 | p0 = simple.test | Function test |
-| assignment.py:1 | p1 = simple.test | Function test |
-| assignment.py:1 | p2 = simple.test | Function test |
-| carrier.py:4 | p1 = explicit.carrier | Function __init__ |
-| carrier.py:4 | p1 = simple.test | Function __init__ |
-| carrier.py:10 | p0.attr = simple.test | Function get_attr |
-| carrier.py:13 | p0 = explicit.carrier | Function hub |
-| carrier.py:13 | p0.attr = simple.test | Function hub |
-| deep.py:2 | p0 = simple.test | Function f1 |
-| deep.py:5 | p0 = simple.test | Function f2 |
-| deep.py:8 | p0 = simple.test | Function f3 |
-| deep.py:11 | p0 = simple.test | Function f4 |
-| deep.py:14 | p0 = simple.test | Function f5 |
-| deep.py:17 | p0 = simple.test | Function f6 |
-| rockpaperscissors.py:3 | p0 = scissors | Function rock |
-| rockpaperscissors.py:6 | p0 = paper | Function paper |
-| rockpaperscissors.py:6 | p0 = rock | Function paper |
-| rockpaperscissors.py:6 | p0 = scissors | Function paper |
-| rockpaperscissors.py:9 | p0 = paper | Function scissors |
-| rockpaperscissors.py:9 | p0 = scissors | Function scissors |
-| sanitizer.py:3 | p0 = Command injection | Function isEscapedSql |
-| sanitizer.py:3 | p0 = SQL injection | Function isEscapedSql |
-| sanitizer.py:5 | p0 = Command injection | Function isValidCommand |
-| sanitizer.py:5 | p0 = SQL injection | Function isValidCommand |
-| test.py:12 | p0 = simple.test | Function sink |
-| test.py:46 | p0 = simple.test | Function sink2 |
-| test.py:49 | p1 = simple.test | Function sink3 |
-| test.py:72 | p0 = basic.custom | Function hub |
-| test.py:72 | p0 = simple.test | Function hub |
-| test.py:72 | p0.x = simple.test | Function hub |
-| test.py:105 | p0.x = simple.test | Function x_sink |
diff --git a/python/ql/test/library-tests/taint/general/Contexts.ql b/python/ql/test/library-tests/taint/general/Contexts.ql
deleted file mode 100644
index 509c8c938f0..00000000000
--- a/python/ql/test/library-tests/taint/general/Contexts.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-import python
-import semmle.python.dataflow.Implementation
-import TaintLib
-
-from CallContext context, Scope s
-where
-  exists(CallContext caller | caller.getCallee(_) = context) and
-  context.appliesToScope(s)
-select s.getLocation().toString(), context, s.toString()
diff --git a/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll b/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll
index a63416ed65c..75c52925dcd 100644
--- a/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll
+++ b/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll
@@ -1,73 +1,106 @@
 import python
 
-abstract class XMLBytecodeExpr extends XMLElement { }
+abstract class XmlBytecodeExpr extends XMLElement { }
 
-class XMLBytecodeConst extends XMLBytecodeExpr {
-  XMLBytecodeConst() { this.hasName("BytecodeConst") }
+/** DEPRECATED: Alias for XmlBytecodeExpr */
+deprecated class XMLBytecodeExpr = XmlBytecodeExpr;
+
+class XmlBytecodeConst extends XmlBytecodeExpr {
+  XmlBytecodeConst() { this.hasName("BytecodeConst") }
 
   string get_value_data_raw() { result = this.getAChild("value").getTextValue() }
 }
 
-class XMLBytecodeVariableName extends XMLBytecodeExpr {
-  XMLBytecodeVariableName() { this.hasName("BytecodeVariableName") }
+/** DEPRECATED: Alias for XmlBytecodeConst */
+deprecated class XMLBytecodeConst = XmlBytecodeConst;
+
+class XmlBytecodeVariableName extends XmlBytecodeExpr {
+  XmlBytecodeVariableName() { this.hasName("BytecodeVariableName") }
 
   string get_name_data() { result = this.getAChild("name").getTextValue() }
 }
 
-class XMLBytecodeAttribute extends XMLBytecodeExpr {
-  XMLBytecodeAttribute() { this.hasName("BytecodeAttribute") }
+/** DEPRECATED: Alias for XmlBytecodeVariableName */
+deprecated class XMLBytecodeVariableName = XmlBytecodeVariableName;
+
+class XmlBytecodeAttribute extends XmlBytecodeExpr {
+  XmlBytecodeAttribute() { this.hasName("BytecodeAttribute") }
 
   string get_attr_name_data() { result = this.getAChild("attr_name").getTextValue() }
 
-  XMLBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
+  XmlBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
 }
 
-class XMLBytecodeSubscript extends XMLBytecodeExpr {
-  XMLBytecodeSubscript() { this.hasName("BytecodeSubscript") }
+/** DEPRECATED: Alias for XmlBytecodeAttribute */
+deprecated class XMLBytecodeAttribute = XmlBytecodeAttribute;
 
-  XMLBytecodeExpr get_key_data() { result.getParent() = this.getAChild("key") }
+class XmlBytecodeSubscript extends XmlBytecodeExpr {
+  XmlBytecodeSubscript() { this.hasName("BytecodeSubscript") }
 
-  XMLBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
+  XmlBytecodeExpr get_key_data() { result.getParent() = this.getAChild("key") }
+
+  XmlBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
 }
 
-class XMLBytecodeTuple extends XMLBytecodeExpr {
-  XMLBytecodeTuple() { this.hasName("BytecodeTuple") }
+/** DEPRECATED: Alias for XmlBytecodeSubscript */
+deprecated class XMLBytecodeSubscript = XmlBytecodeSubscript;
 
-  XMLBytecodeExpr get_elements_data(int index) {
+class XmlBytecodeTuple extends XmlBytecodeExpr {
+  XmlBytecodeTuple() { this.hasName("BytecodeTuple") }
+
+  XmlBytecodeExpr get_elements_data(int index) {
     result = this.getAChild("elements").getChild(index)
   }
 }
 
-class XMLBytecodeList extends XMLBytecodeExpr {
-  XMLBytecodeList() { this.hasName("BytecodeList") }
+/** DEPRECATED: Alias for XmlBytecodeTuple */
+deprecated class XMLBytecodeTuple = XmlBytecodeTuple;
 
-  XMLBytecodeExpr get_elements_data(int index) {
+class XmlBytecodeList extends XmlBytecodeExpr {
+  XmlBytecodeList() { this.hasName("BytecodeList") }
+
+  XmlBytecodeExpr get_elements_data(int index) {
     result = this.getAChild("elements").getChild(index)
   }
 }
 
-class XMLBytecodeCall extends XMLBytecodeExpr {
-  XMLBytecodeCall() { this.hasName("BytecodeCall") }
+/** DEPRECATED: Alias for XmlBytecodeList */
+deprecated class XMLBytecodeList = XmlBytecodeList;
 
-  XMLBytecodeExpr get_function_data() { result.getParent() = this.getAChild("function") }
+class XmlBytecodeCall extends XmlBytecodeExpr {
+  XmlBytecodeCall() { this.hasName("BytecodeCall") }
+
+  XmlBytecodeExpr get_function_data() { result.getParent() = this.getAChild("function") }
 }
 
-class XMLBytecodeUnknown extends XMLBytecodeExpr {
-  XMLBytecodeUnknown() { this.hasName("BytecodeUnknown") }
+/** DEPRECATED: Alias for XmlBytecodeCall */
+deprecated class XMLBytecodeCall = XmlBytecodeCall;
+
+class XmlBytecodeUnknown extends XmlBytecodeExpr {
+  XmlBytecodeUnknown() { this.hasName("BytecodeUnknown") }
 
   string get_opname_data() { result = this.getAChild("opname").getTextValue() }
 }
 
-class XMLBytecodeMakeFunction extends XMLBytecodeExpr {
-  XMLBytecodeMakeFunction() { this.hasName("BytecodeMakeFunction") }
+/** DEPRECATED: Alias for XmlBytecodeUnknown */
+deprecated class XMLBytecodeUnknown = XmlBytecodeUnknown;
 
-  XMLBytecodeExpr get_qualified_name_data() {
+class XmlBytecodeMakeFunction extends XmlBytecodeExpr {
+  XmlBytecodeMakeFunction() { this.hasName("BytecodeMakeFunction") }
+
+  XmlBytecodeExpr get_qualified_name_data() {
     result.getParent() = this.getAChild("qualified_name")
   }
 }
 
-class XMLSomethingInvolvingScaryBytecodeJump extends XMLBytecodeExpr {
-  XMLSomethingInvolvingScaryBytecodeJump() { this.hasName("SomethingInvolvingScaryBytecodeJump") }
+/** DEPRECATED: Alias for XmlBytecodeMakeFunction */
+deprecated class XMLBytecodeMakeFunction = XmlBytecodeMakeFunction;
+
+class XmlSomethingInvolvingScaryBytecodeJump extends XmlBytecodeExpr {
+  XmlSomethingInvolvingScaryBytecodeJump() { this.hasName("SomethingInvolvingScaryBytecodeJump") }
 
   string get_opname_data() { result = this.getAChild("opname").getTextValue() }
 }
+
+/** DEPRECATED: Alias for XmlSomethingInvolvingScaryBytecodeJump */
+deprecated class XMLSomethingInvolvingScaryBytecodeJump = XmlSomethingInvolvingScaryBytecodeJump;
diff --git a/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll b/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll
index fb313fe80bd..279edc5e27d 100644
--- a/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll
+++ b/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll
@@ -4,30 +4,36 @@ import semmle.python.objects.Callables
 import lib.BytecodeExpr
 
 /** The XML data for a recorded call (includes all data). */
-class XMLRecordedCall extends XMLElement {
-  XMLRecordedCall() { this.hasName("recorded_call") }
+class XmlRecordedCall extends XMLElement {
+  XmlRecordedCall() { this.hasName("recorded_call") }
 
   /** Gets the XML data for the call. */
-  XMLCall getXMLCall() { result.getParent() = this }
+  XmlCall getXmlCall() { result.getParent() = this }
+
+  /** DEPRECATED: Alias for getXmlCall */
+  deprecated XMLCall getXMLCall() { result = getXmlCall() }
 
   /** Gets a call matching the recorded information. */
-  Call getACall() { result = this.getXMLCall().getACall() }
+  Call getACall() { result = this.getXmlCall().getACall() }
 
   /** Gets the XML data for the callee. */
-  XMLCallee getXMLCallee() { result.getParent() = this }
+  XmlCallee getXmlCallee() { result.getParent() = this }
+
+  /** DEPRECATED: Alias for getXmlCallee */
+  deprecated XMLCallee getXMLCallee() { result = getXmlCallee() }
 
   /** Gets a python function matching the recorded information of the callee. */
-  Function getAPythonCallee() { result = this.getXMLCallee().(XMLPythonCallee).getACallee() }
+  Function getAPythonCallee() { result = this.getXmlCallee().(XmlPythonCallee).getACallee() }
 
   /** Gets a builtin function matching the recorded information of the callee. */
-  Builtin getABuiltinCallee() { result = this.getXMLCallee().(XMLExternalCallee).getACallee() }
+  Builtin getABuiltinCallee() { result = this.getXmlCallee().(XmlExternalCallee).getACallee() }
 
-  /** Get a different `XMLRecordedCall` with the same result-set for `getACall`. */
-  XMLRecordedCall getOtherWithSameSetOfCalls() {
+  /** Get a different `XmlRecordedCall` with the same result-set for `getACall`. */
+  XmlRecordedCall getOtherWithSameSetOfCalls() {
     // `rc` is for a different bytecode instruction on same line
-    not result.getXMLCall().get_inst_index_data() = this.getXMLCall().get_inst_index_data() and
-    result.getXMLCall().get_filename_data() = this.getXMLCall().get_filename_data() and
-    result.getXMLCall().get_linenum_data() = this.getXMLCall().get_linenum_data() and
+    not result.getXmlCall().get_inst_index_data() = this.getXmlCall().get_inst_index_data() and
+    result.getXmlCall().get_filename_data() = this.getXmlCall().get_filename_data() and
+    result.getXmlCall().get_linenum_data() = this.getXmlCall().get_linenum_data() and
     // set of calls are equal
     forall(Call call | call = this.getACall() or call = result.getACall() |
       call = this.getACall() and call = result.getACall()
@@ -37,23 +43,26 @@ class XMLRecordedCall extends XMLElement {
   override string toString() {
     exists(string path |
       path =
-        any(File file | file.getAbsolutePath() = this.getXMLCall().get_filename_data())
+        any(File file | file.getAbsolutePath() = this.getXmlCall().get_filename_data())
             .getRelativePath()
       or
       not exists(File file |
-        file.getAbsolutePath() = this.getXMLCall().get_filename_data() and
+        file.getAbsolutePath() = this.getXmlCall().get_filename_data() and
         exists(file.getRelativePath())
       ) and
-      path = this.getXMLCall().get_filename_data()
+      path = this.getXmlCall().get_filename_data()
     |
-      result = this.getName() + ": " + path + ":" + this.getXMLCall().get_linenum_data()
+      result = this.getName() + ": " + path + ":" + this.getXmlCall().get_linenum_data()
     )
   }
 }
 
+/** DEPRECATED: Alias for XmlRecordedCall */
+deprecated class XMLRecordedCall = XmlRecordedCall;
+
 /** The XML data for the call part a recorded call. */
-class XMLCall extends XMLElement {
-  XMLCall() { this.hasName("Call") }
+class XmlCall extends XMLElement {
+  XmlCall() { this.hasName("Call") }
 
   string get_filename_data() { result = this.getAChild("filename").getTextValue() }
 
@@ -68,8 +77,8 @@ class XMLCall extends XMLElement {
   }
 
   /** Holds if `expr` can be fully matched with `bytecode`. */
-  private predicate matchBytecodeExpr(Expr expr, XMLBytecodeExpr bytecode) {
-    exists(Call parent_call, XMLBytecodeCall parent_bytecode_call |
+  private predicate matchBytecodeExpr(Expr expr, XmlBytecodeExpr bytecode) {
+    exists(Call parent_call, XmlBytecodeCall parent_bytecode_call |
       parent_call
           .getLocation()
           .hasLocationInfo(this.get_filename_data(), this.get_linenum_data(), _, _, _) and
@@ -78,13 +87,13 @@ class XMLCall extends XMLElement {
       parent_bytecode_call.getAChild*() = bytecode
     ) and
     (
-      expr.(Name).getId() = bytecode.(XMLBytecodeVariableName).get_name_data()
+      expr.(Name).getId() = bytecode.(XmlBytecodeVariableName).get_name_data()
       or
-      expr.(Attribute).getName() = bytecode.(XMLBytecodeAttribute).get_attr_name_data() and
+      expr.(Attribute).getName() = bytecode.(XmlBytecodeAttribute).get_attr_name_data() and
       matchBytecodeExpr(expr.(Attribute).getObject(),
-        bytecode.(XMLBytecodeAttribute).get_object_data())
+        bytecode.(XmlBytecodeAttribute).get_object_data())
       or
-      matchBytecodeExpr(expr.(Call).getFunc(), bytecode.(XMLBytecodeCall).get_function_data())
+      matchBytecodeExpr(expr.(Call).getFunc(), bytecode.(XmlBytecodeCall).get_function_data())
       //
       // I considered allowing a partial match as well. That is, if the bytecode
       // expression information only tells us `<unknown>.foo()`, and we find an AST
@@ -101,12 +110,18 @@ class XMLCall extends XMLElement {
   }
 }
 
+/** DEPRECATED: Alias for XmlCall */
+deprecated class XMLCall = XmlCall;
+
 /** The XML data for the callee part a recorded call. */
-abstract class XMLCallee extends XMLElement { }
+abstract class XmlCallee extends XMLElement { }
+
+/** DEPRECATED: Alias for XmlCallee */
+deprecated class XMLCallee = XmlCallee;
 
 /** The XML data for the callee part a recorded call, when the callee is a Python function. */
-class XMLPythonCallee extends XMLCallee {
-  XMLPythonCallee() { this.hasName("PythonCallee") }
+class XmlPythonCallee extends XmlCallee {
+  XmlPythonCallee() { this.hasName("PythonCallee") }
 
   string get_filename_data() { result = this.getAChild("filename").getTextValue() }
 
@@ -125,9 +140,12 @@ class XMLPythonCallee extends XMLCallee {
   }
 }
 
+/** DEPRECATED: Alias for XmlPythonCallee */
+deprecated class XMLPythonCallee = XmlPythonCallee;
+
 /** The XML data for the callee part a recorded call, when the callee is a C function or builtin. */
-class XMLExternalCallee extends XMLCallee {
-  XMLExternalCallee() { this.hasName("ExternalCallee") }
+class XmlExternalCallee extends XmlCallee {
+  XmlExternalCallee() { this.hasName("ExternalCallee") }
 
   string get_module_data() { result = this.getAChild("module").getTextValue() }
 
@@ -143,6 +161,9 @@ class XMLExternalCallee extends XMLCallee {
   }
 }
 
+/** DEPRECATED: Alias for XmlExternalCallee */
+deprecated class XMLExternalCallee = XmlExternalCallee;
+
 /**
  * Helper predicate. If parent = `builtins` and qualname = `list.append`, it will
  * return the result of `builtins.list.append`.class
@@ -162,9 +183,9 @@ private Builtin traverse_qualname(Builtin parent, string qualname) {
 }
 
 /**
- * Class of recorded calls where we can identify both the `call` and the `callee` uniquely.
+ * A recorded call where we can identify both the `call` and the `callee` uniquely.
  */
-class IdentifiedRecordedCall extends XMLRecordedCall {
+class IdentifiedRecordedCall extends XmlRecordedCall {
   IdentifiedRecordedCall() {
     strictcount(this.getACall()) = 1 and
     (
@@ -182,7 +203,7 @@ class IdentifiedRecordedCall extends XMLRecordedCall {
     // is not recorded, we would still mark the other two recorded calls as valid
     // (which is not following the rules above). + 1 to count `this` as well.
     strictcount(this.getACall()) = strictcount(this.getOtherWithSameSetOfCalls()) + 1 and
-    forex(XMLRecordedCall rc | rc = this.getOtherWithSameSetOfCalls() |
+    forex(XmlRecordedCall rc | rc = this.getOtherWithSameSetOfCalls() |
       unique(Function f | f = this.getAPythonCallee()) =
         unique(Function f | f = rc.getAPythonCallee())
       or
@@ -212,20 +233,20 @@ class IdentifiedRecordedCall extends XMLRecordedCall {
 }
 
 /**
- * Class of recorded calls where we cannot identify both the `call` and the `callee` uniquely.
+ * A recorded call where we cannot identify both the `call` and the `callee` uniquely.
  */
-class UnidentifiedRecordedCall extends XMLRecordedCall {
+class UnidentifiedRecordedCall extends XmlRecordedCall {
   UnidentifiedRecordedCall() { not this instanceof IdentifiedRecordedCall }
 }
 
 /**
- * Recorded calls made from outside project folder, that can be ignored when evaluating
+ * A Recorded call made from outside the project folder. These can be ignored when evaluating
  * call-graph quality.
  */
-class IgnoredRecordedCall extends XMLRecordedCall {
+class IgnoredRecordedCall extends XmlRecordedCall {
   IgnoredRecordedCall() {
     not exists(
-      any(File file | file.getAbsolutePath() = this.getXMLCall().get_filename_data())
+      any(File file | file.getAbsolutePath() = this.getXmlCall().get_filename_data())
           .getRelativePath()
     )
   }
@@ -238,28 +259,28 @@ module PointsToBasedCallGraph {
     Value calleeValue;
 
     ResolvableRecordedCall() {
-      exists(Call call, XMLCallee xmlCallee |
+      exists(Call call, XmlCallee xmlCallee |
         call = this.getACall() and
         calleeValue.getACall() = call.getAFlowNode() and
-        xmlCallee = this.getXMLCallee() and
+        xmlCallee = this.getXmlCallee() and
         (
-          xmlCallee instanceof XMLPythonCallee and
+          xmlCallee instanceof XmlPythonCallee and
           (
             // normal function
-            calleeValue.(PythonFunctionValue).getScope() = xmlCallee.(XMLPythonCallee).getACallee()
+            calleeValue.(PythonFunctionValue).getScope() = xmlCallee.(XmlPythonCallee).getACallee()
             or
             // class instantiation -- points-to says the call goes to the class
             calleeValue.(ClassValue).lookup("__init__").(PythonFunctionValue).getScope() =
-              xmlCallee.(XMLPythonCallee).getACallee()
+              xmlCallee.(XmlPythonCallee).getACallee()
           )
           or
-          xmlCallee instanceof XMLExternalCallee and
+          xmlCallee instanceof XmlExternalCallee and
           calleeValue.(BuiltinFunctionObjectInternal).getBuiltin() =
-            xmlCallee.(XMLExternalCallee).getACallee()
+            xmlCallee.(XmlExternalCallee).getACallee()
           or
-          xmlCallee instanceof XMLExternalCallee and
+          xmlCallee instanceof XmlExternalCallee and
           calleeValue.(BuiltinMethodObjectInternal).getBuiltin() =
-            xmlCallee.(XMLExternalCallee).getACallee()
+            xmlCallee.(XmlExternalCallee).getACallee()
         )
       )
     }
diff --git a/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql b/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql
index fbe8758a7aa..e27f5cb0816 100644
--- a/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql
+++ b/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql
@@ -7,7 +7,7 @@ import lib.RecordedCalls
 
 from string text, float number, float ratio
 where
-  exists(int all_rcs | all_rcs = count(XMLRecordedCall rc) and ratio = number / all_rcs |
+  exists(int all_rcs | all_rcs = count(XmlRecordedCall rc) and ratio = number / all_rcs |
     text = "XMLRecordedCall" and number = all_rcs
     or
     text = "IdentifiedRecordedCall" and number = count(IdentifiedRecordedCall rc)
diff --git a/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql b/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql
index 2216e9dcb3d..c64cb37347e 100644
--- a/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql
+++ b/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql
@@ -3,7 +3,7 @@ import lib.RecordedCalls
 // column i is just used for sorting
 from string text, float number, float ratio, int i
 where
-  exists(int all_rcs | all_rcs = count(XMLRecordedCall rc) and ratio = number / all_rcs |
+  exists(int all_rcs | all_rcs = count(XmlRecordedCall rc) and ratio = number / all_rcs |
     text = "XMLRecordedCall" and number = all_rcs and i = 0
     or
     text = "IgnoredRecordedCall" and number = count(IgnoredRecordedCall rc) and i = 1
@@ -17,7 +17,7 @@ where
   i = 10
   or
   exists(int all_not_ignored_rcs |
-    all_not_ignored_rcs = count(XMLRecordedCall rc | not rc instanceof IgnoredRecordedCall) and
+    all_not_ignored_rcs = count(XmlRecordedCall rc | not rc instanceof IgnoredRecordedCall) and
     ratio = number / all_not_ignored_rcs
   |
     text = "IdentifiedRecordedCall" and
diff --git a/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql b/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql
index df2fe3f261f..98b65e6f8a2 100644
--- a/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql
+++ b/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql
@@ -4,6 +4,6 @@ import lib.RecordedCalls
 // Could be useful for deciding which new opcodes to support
 from string op_name, int c
 where
-  exists(XMLBytecodeUnknown unknown | unknown.get_opname_data() = op_name) and
-  c = count(XMLBytecodeUnknown unknown | unknown.get_opname_data() = op_name | 1)
+  exists(XmlBytecodeUnknown unknown | unknown.get_opname_data() = op_name) and
+  c = count(XmlBytecodeUnknown unknown | unknown.get_opname_data() = op_name | 1)
 select op_name, c order by c
diff --git a/ql/ql/src/codeql/GlobalValueNumbering.qll b/ql/ql/src/codeql/GlobalValueNumbering.qll
index e9b4728a6be..937d342a37d 100644
--- a/ql/ql/src/codeql/GlobalValueNumbering.qll
+++ b/ql/ql/src/codeql/GlobalValueNumbering.qll
@@ -5,7 +5,7 @@ private import codeql_ql.ast.internal.Builtins
 
 private newtype TValueNumber =
   TVariableValueNumber(VarDecl var) { variableAccessValueNumber(_, var) } or
-  TFieldValueNumber(VarDecl var) { fieldAccessValueNumber(_, var) } or
+  TFieldValueNumber(FieldDecl var) { fieldAccessValueNumber(_, var) } or
   TThisValueNumber(Predicate pred) { thisAccessValueNumber(_, pred) } or
   TPredicateValueNumber(PredicateOrBuiltin pred, ValueNumberArgumentList args) {
     predicateCallValueNumber(_, pred, args)
@@ -103,7 +103,7 @@ private predicate variableAccessValueNumber(VarAccess access, VarDef var) {
   access.getDeclaration() = var
 }
 
-private predicate fieldAccessValueNumber(FieldAccess access, VarDef var) {
+private predicate fieldAccessValueNumber(FieldAccess access, FieldDecl var) {
   access.getDeclaration() = var
 }
 
@@ -179,7 +179,7 @@ private TValueNumber nonUniqueValueNumber(Expr e) {
     result = TVariableValueNumber(var)
   )
   or
-  exists(VarDecl var |
+  exists(FieldDecl var |
     fieldAccessValueNumber(e, var) and
     result = TFieldValueNumber(var)
   )
diff --git a/ql/ql/src/codeql/Locations.qll b/ql/ql/src/codeql/Locations.qll
index 7497525d7af..7d2df1565d8 100644
--- a/ql/ql/src/codeql/Locations.qll
+++ b/ql/ql/src/codeql/Locations.qll
@@ -28,6 +28,7 @@ class Location extends @location {
   int getNumLines() { result = getEndLine() - getStartLine() + 1 }
 
   /** Gets a textual representation of this element. */
+  cached
   string toString() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
diff --git a/ql/ql/src/codeql_ql/ast/Ast.qll b/ql/ql/src/codeql_ql/ast/Ast.qll
index 95d01936f03..5d3fdffaea2 100644
--- a/ql/ql/src/codeql_ql/ast/Ast.qll
+++ b/ql/ql/src/codeql_ql/ast/Ast.qll
@@ -156,6 +156,16 @@ class QLDoc extends TQLDoc, AstNode {
   override string getAPrimaryQlClass() { result = "QLDoc" }
 }
 
+class BlockComment extends TBlockComment, AstNode {
+  QL::BlockComment comment;
+
+  BlockComment() { this = TBlockComment(comment) }
+
+  string getContents() { result = comment.getValue() }
+
+  override string getAPrimaryQlClass() { result = "BlockComment" }
+}
+
 /**
  * The `from, where, select` part of a QL query.
  */
@@ -1754,11 +1764,11 @@ class FieldAccess extends Identifier {
   FieldAccess() { resolveField(this, decl) }
 
   /** Gets the accessed field. */
-  VarDecl getDeclaration() { result = decl }
+  FieldDecl getDeclaration() { result.getVarDecl() = decl }
 
   override string getName() { result = id.getChild().(QL::VarName).getChild().getValue() }
 
-  override Type getType() { result = this.getDeclaration().getType() }
+  override Type getType() { result = decl.getType() }
 
   override string getAPrimaryQlClass() { result = "FieldAccess" }
 }
@@ -1867,13 +1877,13 @@ class BinOpExpr extends TBinOpExpr, Expr {
   /** Gets the left operand of the binary expression. */
   Expr getLeftOperand() { none() } // overriden in subclasses
 
-  /* Gets the right operand of the binary expression. */
+  /** Gets the right operand of the binary expression. */
   Expr getRightOperand() { none() } // overriden in subclasses
 
   /** Gets the operator of the binary expression. */
   FunctionSymbol getOperator() { none() } // overriden in subclasses
 
-  /* Gets an operand of the binary expression. */
+  /** Gets an operand of the binary expression. */
   final Expr getAnOperand() { result = this.getLeftOperand() or result = this.getRightOperand() }
 }
 
@@ -2299,35 +2309,38 @@ class BindingSet extends Annotation {
  */
 module YAML {
   /** A node in a YAML file */
-  class YAMLNode extends TYAMLNode, AstNode {
+  class YAMLNode extends TYamlNode, AstNode {
     /** Holds if the predicate is a root node (has no parent) */
     predicate isRoot() { not exists(this.getParent()) }
   }
 
   /** A YAML comment. */
-  class YAMLComment extends TYamlCommemt, YAMLNode {
+  class YamlComment extends TYamlCommemt, YAMLNode {
     QL::YamlComment yamlcomment;
 
-    YAMLComment() { this = TYamlCommemt(yamlcomment) }
+    YamlComment() { this = TYamlCommemt(yamlcomment) }
 
-    override string getAPrimaryQlClass() { result = "YAMLComment" }
+    override string getAPrimaryQlClass() { result = "YamlComment" }
   }
 
+  /** DEPRECATED: Alias for YamlComment */
+  deprecated class YAMLComment = YamlComment;
+
   /** A YAML entry. */
-  class YAMLEntry extends TYamlEntry, YAMLNode {
+  class YamlEntry extends TYamlEntry, YAMLNode {
     QL::YamlEntry yamle;
 
-    YAMLEntry() { this = TYamlEntry(yamle) }
+    YamlEntry() { this = TYamlEntry(yamle) }
 
     /** Gets the key of this YAML entry. */
-    YAMLKey getKey() {
+    YamlKey getKey() {
       exists(QL::YamlKeyvaluepair pair |
         pair.getParent() = yamle and
         result = TYamlKey(pair.getKey())
       )
     }
 
-    YAMLListItem getListItem() { toQL(result).getParent() = yamle }
+    YamlListItem getListItem() { toQL(result).getParent() = yamle }
 
     /** Gets the value of this YAML entry. */
     YAMLValue getValue() {
@@ -2337,14 +2350,17 @@ module YAML {
       )
     }
 
-    override string getAPrimaryQlClass() { result = "YAMLEntry" }
+    override string getAPrimaryQlClass() { result = "YamlEntry" }
   }
 
+  /** DEPRECATED: Alias for YamlEntry */
+  deprecated class YAMLEntry = YamlEntry;
+
   /** A YAML key. */
-  class YAMLKey extends TYamlKey, YAMLNode {
+  class YamlKey extends TYamlKey, YAMLNode {
     QL::YamlKey yamlkey;
 
-    YAMLKey() { this = TYamlKey(yamlkey) }
+    YamlKey() { this = TYamlKey(yamlkey) }
 
     /**
      * Gets the value of this YAML key.
@@ -2355,13 +2371,13 @@ module YAML {
       )
     }
 
-    override string getAPrimaryQlClass() { result = "YAMLKey" }
+    override string getAPrimaryQlClass() { result = "YamlKey" }
 
     /** Gets the value of this YAML value. */
     string getNamePart(int i) {
       i = 0 and result = yamlkey.getChild(0).(QL::SimpleId).getValue()
       or
-      exists(YAMLKey child |
+      exists(YamlKey child |
         child = TYamlKey(yamlkey.getChild(1)) and
         result = child.getNamePart(i - 1)
       )
@@ -2376,20 +2392,26 @@ module YAML {
     }
   }
 
+  /** DEPRECATED: Alias for YamlKey */
+  deprecated class YAMLKey = YamlKey;
+
   /** A YAML list item. */
-  class YAMLListItem extends TYamlListitem, YAMLNode {
+  class YamlListItem extends TYamlListitem, YAMLNode {
     QL::YamlListitem yamllistitem;
 
-    YAMLListItem() { this = TYamlListitem(yamllistitem) }
+    YamlListItem() { this = TYamlListitem(yamllistitem) }
 
     /**
      * Gets the value of this YAML list item.
      */
     YAMLValue getValue() { result = TYamlValue(yamllistitem.getChild()) }
 
-    override string getAPrimaryQlClass() { result = "YAMLListItem" }
+    override string getAPrimaryQlClass() { result = "YamlListItem" }
   }
 
+  /** DEPRECATED: Alias for YamlListItem */
+  deprecated class YAMLListItem = YamlListItem;
+
   /** A YAML value. */
   class YAMLValue extends TYamlValue, YAMLNode {
     QL::YamlValue yamlvalue;
@@ -2414,7 +2436,7 @@ module YAML {
     QLPack() { this = MKQlPack(file) }
 
     private string getProperty(string name) {
-      exists(YAMLEntry entry |
+      exists(YamlEntry entry |
         entry.isRoot() and
         entry.getKey().getQualifiedName() = name and
         result = entry.getValue().getValue().trim() and
@@ -2436,8 +2458,8 @@ module YAML {
     /** Gets the file that this `QLPack` represents. */
     File getFile() { result = file }
 
-    private predicate isADependency(YAMLEntry entry) {
-      exists(YAMLEntry deps |
+    private predicate isADependency(YamlEntry entry) {
+      exists(YamlEntry deps |
         deps.getLocation().getFile() = file and entry.getLocation().getFile() = file
       |
         deps.isRoot() and
@@ -2446,7 +2468,7 @@ module YAML {
         entry.getLocation().getStartColumn() > deps.getLocation().getStartColumn()
       )
       or
-      exists(YAMLEntry prev | this.isADependency(prev) |
+      exists(YamlEntry prev | this.isADependency(prev) |
         prev.getLocation().getFile() = file and
         entry.getLocation().getFile() = file and
         entry.getLocation().getStartLine() = 1 + prev.getLocation().getStartLine() and
@@ -2455,7 +2477,7 @@ module YAML {
     }
 
     predicate hasDependency(string name, string version) {
-      exists(YAMLEntry entry | this.isADependency(entry) |
+      exists(YamlEntry entry | this.isADependency(entry) |
         entry.getKey().getQualifiedName().trim() = name and
         entry.getValue().getValue() = version
         or
diff --git a/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll b/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
index c3d22be6346..ac06cdd9548 100644
--- a/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
@@ -6,6 +6,7 @@ cached
 newtype TAstNode =
   TTopLevel(QL::Ql file) or
   TQLDoc(QL::Qldoc qldoc) or
+  TBlockComment(QL::BlockComment comment) or
   TClasslessPredicate(QL::ClasslessPredicate pred) or
   TVarDecl(QL::VarDecl decl) or
   TFieldDecl(QL::Field field) or
@@ -84,7 +85,10 @@ class TCall = TPredicateCall or TMemberCall or TNoneCall or TAnyCall;
 
 class TModuleRef = TImport or TModuleExpr;
 
-class TYAMLNode = TYamlCommemt or TYamlEntry or TYamlKey or TYamlListitem or TYamlValue;
+class TYamlNode = TYamlCommemt or TYamlEntry or TYamlKey or TYamlListitem or TYamlValue;
+
+/** DEPRECATED: Alias for TYamlNode */
+deprecated class TYAMLNode = TYamlNode;
 
 private QL::AstNode toQLFormula(AST::AstNode n) {
   n = TConjunction(result) or
@@ -115,7 +119,7 @@ private QL::AstNode toQLExpr(AST::AstNode n) {
   n = TDontCare(result)
 }
 
-private QL::AstNode toGenerateYAML(AST::AstNode n) {
+private QL::AstNode toGenerateYaml(AST::AstNode n) {
   n = TYamlCommemt(result) or
   n = TYamlEntry(result) or
   n = TYamlKey(result) or
@@ -132,7 +136,7 @@ QL::AstNode toQL(AST::AstNode n) {
   or
   result = toQLFormula(n)
   or
-  result = toGenerateYAML(n)
+  result = toGenerateYaml(n)
   or
   result.(QL::ParExpr).getChild() = toQL(n)
   or
@@ -146,6 +150,8 @@ QL::AstNode toQL(AST::AstNode n) {
   or
   n = TQLDoc(result)
   or
+  n = TBlockComment(result)
+  or
   n = TClasslessPredicate(result)
   or
   n = TVarDecl(result)
diff --git a/ql/ql/src/codeql_ql/ast/internal/Module.qll b/ql/ql/src/codeql_ql/ast/internal/Module.qll
index 1e58d34ac53..50416337bf4 100644
--- a/ql/ql/src/codeql_ql/ast/internal/Module.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/Module.qll
@@ -14,13 +14,33 @@ private class ContainerOrModule extends TContainerOrModule {
   ) {
     none()
   }
+
+  /** Gets the kind of this file/module/folder. */
+  string getKind() {
+    this = TFile(_) and result = "file"
+    or
+    this = TModule(_) and result = "module"
+    or
+    this = TFolder(_) and result = "folder"
+  }
 }
 
 private class TFileOrModule = TFile or TModule;
 
 /** A file or a module. */
 class FileOrModule extends TFileOrModule, ContainerOrModule {
-  abstract File getFile();
+  /** Gets the module for this imported module. */
+  Module asModule() { this = TModule(result) }
+
+  /** Gets the file for this file. */
+  File asFile() { this = TFile(result) }
+
+  /** Gets the file that contains this module/file. */
+  File getFile() {
+    result = this.asFile()
+    or
+    result = this.asModule().getLocation().getFile()
+  }
 }
 
 private class File_ extends FileOrModule, TFile {
@@ -43,8 +63,6 @@ private class File_ extends FileOrModule, TFile {
     endline = 0 and
     endcolumn = 0
   }
-
-  override File getFile() { result = f }
 }
 
 private class Folder_ extends ContainerOrModule, TFolder {
@@ -94,8 +112,6 @@ class Module_ extends FileOrModule, TModule {
   ) {
     m.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
-
-  override File getFile() { result = m.getLocation().getFile() }
 }
 
 private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {
diff --git a/ql/ql/src/codeql_ql/ast/internal/Variable.qll b/ql/ql/src/codeql_ql/ast/internal/Variable.qll
index 376de8a9f73..09f5894b20e 100644
--- a/ql/ql/src/codeql_ql/ast/internal/Variable.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/Variable.qll
@@ -85,7 +85,7 @@ module VarConsistency {
     strictcount(v.getDeclaration()) > 1
   }
 
-  query predicate multipleFieldDefs(FieldAccess f, VarDef decl) {
+  query predicate multipleFieldDefs(FieldAccess f, FieldDecl decl) {
     decl = f.getDeclaration() and
     strictcount(f.getDeclaration()) > 1
   }
diff --git a/ql/ql/src/codeql_ql/bugs/PathProblemQueryQuery.qll b/ql/ql/src/codeql_ql/bugs/PathProblemQueryQuery.qll
new file mode 100644
index 00000000000..9533d2abea5
--- /dev/null
+++ b/ql/ql/src/codeql_ql/bugs/PathProblemQueryQuery.qll
@@ -0,0 +1,44 @@
+import ql
+private import codeql_ql.ast.internal.Module
+
+FileOrModule hasQueryRelation(ClasslessPredicate pred) {
+  pred.hasAnnotation("query") and
+  (
+    result.asModule().getAMember() = pred
+    or
+    any(TopLevel top | top.getLocation().getFile() = result.asFile()).getAMember() = pred
+  )
+}
+
+FileOrModule importsQueryRelation(ClasslessPredicate pred) {
+  result = hasQueryRelation(pred)
+  or
+  exists(Import i |
+    not (i.hasAnnotation("private") and i.getLocation().getFile().getExtension() = "qll") and
+    importsQueryRelation(pred) = i.getResolvedModule()
+  |
+    i = result.asModule().getAMember()
+    or
+    i = any(TopLevel top | top.getLocation().getFile() = result.asFile()).getAMember()
+  )
+}
+
+class Query extends File {
+  Query() { this.getExtension() = "ql" }
+
+  predicate isPathProblem() {
+    exists(QLDoc doc | doc.getLocation().getFile() = this |
+      doc.getContents().matches("%@kind path-problem%")
+    )
+  }
+
+  predicate isProblem() {
+    exists(QLDoc doc | doc.getLocation().getFile() = this |
+      doc.getContents().matches("%@kind problem%")
+    )
+  }
+
+  predicate hasEdgesRelation(ClasslessPredicate pred) {
+    importsQueryRelation(pred).asFile() = this and pred.getName() = "edges"
+  }
+}
diff --git a/ql/ql/src/codeql_ql/style/AcronymsShouldBeCamelCaseQuery.qll b/ql/ql/src/codeql_ql/style/AcronymsShouldBeCamelCaseQuery.qll
new file mode 100644
index 00000000000..e33ac0b3b91
--- /dev/null
+++ b/ql/ql/src/codeql_ql/style/AcronymsShouldBeCamelCaseQuery.qll
@@ -0,0 +1,72 @@
+import ql
+
+/**
+ * Gets the name for a `node` that defines something in a QL program.
+ * E.g. a predicate, class, or module definition.
+ */
+string getName(AstNode node, string kind) {
+  result = node.(Class).getName() and kind = "class"
+  or
+  // not including CharPreds or db relations. The remaining are: classlessPredicate, classPredicate, newTypeBranch.
+  result = node.(ClasslessPredicate).getName() and
+  kind = "classlessPredicate"
+  or
+  result = node.(ClassPredicate).getName() and
+  kind = "classPredicate"
+  or
+  result = node.(NewTypeBranch).getName() and
+  kind = "newtypeBranch"
+  or
+  result = node.(NewType).getName() and
+  kind = "newtype"
+  or
+  result = node.(VarDecl).getName() and
+  kind = "variable" and
+  not node = any(FieldDecl f).getVarDecl()
+  or
+  result = node.(FieldDecl).getName() and kind = "field"
+  or
+  result = node.(Module).getName() and kind = "module"
+  or
+  result = node.(Import).importedAs() and kind = "import"
+}
+
+string prettyPluralKind(string kind) {
+  kind = "class" and result = "classes"
+  or
+  kind = "classlessPredicate" and result = "predicates"
+  or
+  kind = "classPredicate" and result = "class predicates"
+  or
+  kind = "newtypeBranch" and result = "newtype branches"
+  or
+  kind = "newtype" and result = "newtypes"
+  or
+  kind = "variable" and result = "variables"
+  or
+  kind = "field" and result = "fields"
+  or
+  kind = "module" and result = "modules"
+  or
+  kind = "import" and result = "imports"
+}
+
+/**
+ * Holds if `name` seems to contain an upper-cased acronym that could be pascal-cased.
+ * `name` is the name of `node`, and `kind` describes what kind of definition `node` is.
+ */
+predicate shouldBePascalCased(string name, AstNode node, string kind) {
+  name = getName(node, kind) and
+  (
+    // when the acronym is followed by something, then there must be 4 upper-case letters
+    name.regexpMatch(".*[A-Z]{4,}([^A-Z]).*")
+    or
+    // when the acronym is the last part, then we only require 3 upper-case letters
+    name.regexpMatch(".*[A-Z]{3,}$")
+  ) and
+  not node.hasAnnotation("deprecated") and
+  // allowed upper-case acronyms.
+  not name.regexpMatch(".*(PEP|AES|DES|EOF).*") and
+  not (name.regexpMatch("T[A-Z]{3}[^A-Z].*") and node instanceof NewTypeBranch) and
+  not name.toUpperCase() = name // We are OK with fully-uppercase names.
+}
diff --git a/ql/ql/src/codeql_ql/style/DeadCodeQuery.qll b/ql/ql/src/codeql_ql/style/DeadCodeQuery.qll
new file mode 100644
index 00000000000..0975d34be39
--- /dev/null
+++ b/ql/ql/src/codeql_ql/style/DeadCodeQuery.qll
@@ -0,0 +1,254 @@
+import ql
+import codeql_ql.bugs.PathProblemQueryQuery as PathProblemQuery
+import codeql_ql.ast.internal.Module
+
+/** Gets something that can be imported by a ".qll" file. */
+private AstNode publicApi() {
+  // base case - the toplevel is always "exported".
+  result instanceof TopLevel
+  or
+  // recursive case. A public class/module/predicate/import that is a child of a public API.
+  not result.hasAnnotation("private") and
+  not result.getLocation().getFile().getExtension() = "ql" and // everything in ".ql" files is kinda private, as you can't import it. Query predicates/from-where-select is handled in `queryable`.
+  result.getParent() = publicApi() and
+  (
+    result instanceof Class
+    or
+    result instanceof ClasslessPredicate
+    or
+    result instanceof Module
+    or
+    result instanceof Import
+  )
+  or
+  result = publicApi().(Import).getResolvedModule().asModule()
+}
+
+/**
+ * Gets any AstNode that directly computes a result of a query.
+ * I.e. a query predicate or the from-where-select.
+ */
+private AstNode queryPredicate() {
+  // result = query relation that is "transitively" imported by a .ql file.
+  PathProblemQuery::importsQueryRelation(result).asFile().getExtension() = "ql"
+  or
+  // the from-where-select
+  result instanceof Select
+  or
+  // child of the above.
+  result = queryPredicate().getAChild()
+}
+
+AstNode hackyShouldBeTreatedAsAlive() {
+  // Stages from the shared DataFlow impl are copy-pasted, so predicates that are dead in one stage are not dead in another.
+  result = any(Module mod | mod.getName().matches("Stage%")).getAMember().(ClasslessPredicate) and
+  result.getLocation().getFile().getBaseName().matches("DataFlowImpl%")
+  or
+  // Python stuff
+  result.(Predicate).getName() = "quickEvalMe" // private predicate used for quick-eval
+  or
+  result.(Module).getName() = "FutureWork" // holder for later.
+  or
+  result = hackyShouldBeTreatedAsAlive().getAChild()
+}
+
+/**
+ * Gets an AST node that is alive.
+ * That is, an API node that may in some way be part of or affect a query result or a publicly available API.
+ */
+private AstNode alive() {
+  //
+  // The 4 base cases.
+  //
+  // 1) everything that can be imported.
+  result = publicApi()
+  or
+  // 2) everything that can be an output when running a query
+  result = queryPredicate()
+  or
+  // 3) A module with an import that imports another file, the import can activate a file.
+  result.(Module).getAMember().(Import).getResolvedModule().getFile() !=
+    result.getLocation().getFile()
+  or
+  // 4) Things that aren't really alive, but that this query treats as live.
+  result = hackyShouldBeTreatedAsAlive()
+  or
+  result instanceof TopLevel // toplevel is always alive.
+  or
+  // recurisve cases
+  result = aliveStep(alive())
+}
+
+private AstNode aliveStep(AstNode prev) {
+  //
+  // The recursive cases.
+  //
+  result.getEnclosingPredicate() = prev
+  or
+  result = prev.(Call).getTarget()
+  or
+  prev.(ClassPredicate).overrides(result)
+  or
+  result.(ClassPredicate).overrides(prev)
+  or
+  result = prev.(PredicateExpr).getResolvedPredicate()
+  or
+  // if a sub-class is alive, then the super-class is alive.
+  result = prev.(Class).getASuperType().getResolvedType().(ClassType).getDeclaration()
+  or
+  // if the super class is alive and abstract, then any sub-class is alive.
+  exists(Class sup | sup = prev and sup.isAbstract() |
+    sup = result.(Class).getASuperType().getResolvedType().(ClassType).getDeclaration()
+  )
+  or
+  result = prev.(Class).getAChild() and
+  not result.hasAnnotation("private")
+  or
+  result = prev.getAnAnnotation()
+  or
+  result = prev.getQLDoc()
+  or
+  // any imported module is alive. We don't have to handle the "import a file"-case, those are treated as public APIs.
+  result = prev.(Import).getResolvedModule().asModule()
+  or
+  result = prev.(VarDecl).getType().getDeclaration()
+  or
+  result = prev.(FieldDecl).getVarDecl()
+  or
+  result = prev.(InlineCast).getType().getDeclaration()
+  or
+  // a class overrides some predicate, is the super-predicate is alive.
+  exists(ClassPredicate pred, ClassPredicate sup |
+    pred.hasAnnotation("override") and
+    pred.overrides(sup) and
+    result = pred.getParent() and
+    sup.getParent() = prev
+  )
+  or
+  // if a class is alive, so is it's super-class
+  result =
+    [prev.(Class).getASuperType(), prev.(Class).getAnInstanceofType()]
+        .getResolvedType()
+        .getDeclaration()
+  or
+  // if a class is alive and abstract, then any sub-class is alive.
+  exists(Class clz, Class sup | result = clz |
+    clz.getASuperType().getResolvedType().getDeclaration() = sup and
+    sup.isAbstract() and
+    sup = prev
+  )
+  or
+  // a module containing something live, is also alive.
+  result.(Module).getAMember() = prev
+  or
+  result = prev.(Module).getAlias()
+  or
+  result.(NewType).getABranch() = prev
+  or
+  result = prev.(TypeExpr).getAChild()
+  or
+  result = prev.(FieldAccess).getDeclaration()
+  or
+  result = prev.(VarDecl).getTypeExpr()
+  or
+  result.(Import).getParent() = prev
+  or
+  result = prev.(NewType).getABranch()
+  or
+  result = prev.(ModuleExpr).getAChild()
+  or
+  result = prev.(ModuleExpr).getResolvedModule().asModule()
+  or
+  result = prev.(InstanceOf).getType().getResolvedType().getDeclaration()
+  or
+  result = prev.(Annotation).getAChild()
+  or
+  result = prev.(Predicate).getReturnType().getDeclaration()
+}
+
+private AstNode deprecated() {
+  result.hasAnnotation("deprecated")
+  or
+  result = deprecated().getQLDoc()
+  or
+  result = deprecated().getAnAnnotation()
+  or
+  result = deprecated().getAChild()
+}
+
+// our type-resolution skips these, so ignore.
+private AstNode classUnion() {
+  exists(result.(Class).getUnionMember())
+  or
+  exists(result.(Class).getAliasType())
+  or
+  result = classUnion().(Class).getUnionMember()
+  or
+  result = classUnion().(Class).getAliasType()
+  or
+  result = classUnion().getAnAnnotation()
+  or
+  result = classUnion().getQLDoc()
+  or
+  result = classUnion().(TypeExpr).getAChild()
+  or
+  result = classUnion().(ModuleExpr).getAChild()
+}
+
+private AstNode benign() {
+  not result.getLocation().getFile().getExtension() = ["ql", "qll"] or // ignore dbscheme files
+  result instanceof BlockComment or
+  not exists(result.toString()) or // <- invalid code
+  // cached-stages pattern
+  result.(Module).getAMember().(ClasslessPredicate).getName() = "forceStage" or
+  result.(ClasslessPredicate).getName() = "forceStage" or
+  result.getLocation().getFile().getBaseName() = "Caching.qll" or
+  // sometimes contains dead code - ignore
+  result.getLocation().getFile().getRelativePath().matches("%/tutorials/%") or
+  result = classUnion()
+}
+
+private predicate isDeadInternal(AstNode node) {
+  not node = alive() and
+  not node = deprecated()
+}
+
+predicate isDead(AstNode node) {
+  isDeadInternal(node) and
+  not isDeadInternal(node.getParent()) and
+  not node = benign()
+}
+
+/**
+ * Gets an AST node that affects a query.
+ */
+private AstNode queryable() {
+  //
+  // The base cases.
+  //
+  // everything that can be an output when running a query
+  result = queryPredicate()
+  or
+  // A module with an import that imports another file, the import can activate a file.
+  result.(Module).getAMember().(Import).getResolvedModule().getFile() !=
+    result.getLocation().getFile()
+  or
+  result instanceof TopLevel // toplevel is always alive.
+  or
+  // recurisve cases
+  result = aliveStep(queryable())
+}
+
+/**
+ * Gets an AstNode that does not affect any query result.
+ * Is interresting as an quick-eval target to investigate dead code.
+ * (It is intentional that this predicate is a result of this predicate).
+ */
+AstNode unQueryable(string msg) {
+  not result = queryable() and
+  not result = deprecated() and
+  not result = benign() and
+  not result.getParent() = any(AstNode node | not node = queryable()) and
+  msg = result.getLocation().getFile().getBaseName() and
+  result.getLocation().getFile().getAbsolutePath().matches("%/javascript/%")
+}
diff --git a/ql/ql/src/codeql_ql/style/UseInstanceofExtensionQuery.qll b/ql/ql/src/codeql_ql/style/UseInstanceofExtensionQuery.qll
index c4154612b4d..fcd798914ff 100644
--- a/ql/ql/src/codeql_ql/style/UseInstanceofExtensionQuery.qll
+++ b/ql/ql/src/codeql_ql/style/UseInstanceofExtensionQuery.qll
@@ -40,7 +40,7 @@ InlineCast getAThisCast(Class c, Type type) {
   )
 }
 
-predicate usesFieldBasedInstanceof(Class c, TypeExpr type, VarDecl field, ComparisonFormula comp) {
+predicate usesFieldBasedInstanceof(Class c, TypeExpr type, FieldDecl field, ComparisonFormula comp) {
   exists(FieldAccess fieldAccess |
     c.getCharPred().getBody() = comp or
     c.getCharPred().getBody().(Conjunction).getAnOperand() = comp
@@ -50,7 +50,7 @@ predicate usesFieldBasedInstanceof(Class c, TypeExpr type, VarDecl field, Compar
     comp.getAnOperand() instanceof ThisAccess and
     comp.getAnOperand() = fieldAccess and
     fieldAccess.getDeclaration() = field and
-    field.getTypeExpr() = type
+    field.getVarDecl().getTypeExpr() = type
   ) and
   // require that there is a call to the range field that matches the name of the enclosing predicate
   exists(FieldAccess access, MemberCall call |
@@ -60,7 +60,7 @@ predicate usesFieldBasedInstanceof(Class c, TypeExpr type, VarDecl field, Compar
   )
 }
 
-FieldAccess getARangeFieldAccess(Class c, VarDecl field, string name) {
+FieldAccess getARangeFieldAccess(Class c, FieldDecl field, string name) {
   exists(MemberCall call |
     result = call.getBase() and
     result.getDeclaration() = field and
diff --git a/ql/ql/src/codeql_ql/style/UseSetLiteralQuery.qll b/ql/ql/src/codeql_ql/style/UseSetLiteralQuery.qll
index 5d08e1834d1..c253f3da7fe 100644
--- a/ql/ql/src/codeql_ql/style/UseSetLiteralQuery.qll
+++ b/ql/ql/src/codeql_ql/style/UseSetLiteralQuery.qll
@@ -68,7 +68,7 @@ class DisjunctionEqualsLiteral extends DisjunctionChain {
     )
     or
     // FieldAccess on the same variable
-    exists(VarDecl v |
+    exists(FieldDecl v |
       forex(Formula f | f = getOperand(_) |
         f.(EqualsLiteral).getAnOperand().(FieldAccess).getDeclaration() = v
       ) and
diff --git a/ql/ql/src/ide-contextual-queries/Definitions.qll b/ql/ql/src/ide-contextual-queries/Definitions.qll
index eef1eb9b71d..f6781c68414 100644
--- a/ql/ql/src/ide-contextual-queries/Definitions.qll
+++ b/ql/ql/src/ide-contextual-queries/Definitions.qll
@@ -48,7 +48,7 @@ private predicate resolveVar(VarAccess va, VarDecl decl, string kind) {
   kind = "variable"
 }
 
-private predicate resolveField(FieldAccess va, VarDecl decl, string kind) {
+private predicate resolveField(FieldAccess va, FieldDecl decl, string kind) {
   decl = va.getDeclaration() and
   kind = "field"
 }
diff --git a/ql/ql/src/queries/bugs/OrderByConst.ql b/ql/ql/src/queries/bugs/OrderByConst.ql
new file mode 100644
index 00000000000..12ed048aa77
--- /dev/null
+++ b/ql/ql/src/queries/bugs/OrderByConst.ql
@@ -0,0 +1,28 @@
+/**
+ * @name Order by const
+ * @description Ordering by a constant has no effect, and is an indication is a misplaced order by clause.
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/order-by-const
+ * @tags correctness
+ *       maintainability
+ * @precision medium
+ */
+
+import ql
+
+Expr getAnOrderBy(AstNode parent, string kind) {
+  result = parent.(FullAggregate).getOrderBy(_) and
+  kind = parent.(FullAggregate).getKind() + " aggregate"
+  or
+  result = parent.(Select).getOrderBy(_) and kind = "select"
+  or
+  result = parent.(ExprAggregate).getOrderBy(_) and
+  kind = parent.(ExprAggregate).getKind() + " aggregate"
+}
+
+from Expr orderBy, AstNode parent, string kind
+where
+  orderBy = getAnOrderBy(parent, kind) and
+  orderBy instanceof Literal
+select orderBy, "Ordering $@ by a constant.", parent, kind
diff --git a/ql/ql/src/queries/bugs/PathProblemQuery.ql b/ql/ql/src/queries/bugs/PathProblemQuery.ql
new file mode 100644
index 00000000000..3b79c5af2a9
--- /dev/null
+++ b/ql/ql/src/queries/bugs/PathProblemQuery.ql
@@ -0,0 +1,25 @@
+/**
+ * @name Missing edges query predicate in path-problem
+ * @description A path-problem query should have a edges relation, and a problem query should not.
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/path-problem-query
+ * @tags correctness
+ *       maintainability
+ * @precision medium
+ */
+
+import ql
+import codeql_ql.bugs.PathProblemQueryQuery
+
+from Query query, string msg, AstNode pred
+where
+  query.isPathProblem() and
+  not query.hasEdgesRelation(_) and
+  pred = any(TopLevel top | top.getLocation().getFile() = query) and // <- dummy value
+  msg = "A path-problem query should have a edges relation."
+  or
+  query.isProblem() and
+  query.hasEdgesRelation(pred) and
+  msg = "A problem query should not have a $@."
+select query, msg, pred, "edges relation"
diff --git a/ql/ql/src/queries/diagnostics/EmptyConsistencies.ql b/ql/ql/src/queries/diagnostics/EmptyConsistencies.ql
index a3c36fcf594..ad437373af2 100644
--- a/ql/ql/src/queries/diagnostics/EmptyConsistencies.ql
+++ b/ql/ql/src/queries/diagnostics/EmptyConsistencies.ql
@@ -1,5 +1,5 @@
 /**
- * @name Consistency predicate that should be empty
+ * @name QL-for-QL encountered an internal consistency error
  * @description This query should have no results on the CodeQL repos.
  *              It's marked as a warning query to make the results visible.
  * @kind problem
diff --git a/ql/ql/src/queries/style/AcronymsShouldBeCamelCase.ql b/ql/ql/src/queries/style/AcronymsShouldBeCamelCase.ql
new file mode 100644
index 00000000000..b9b64f93e13
--- /dev/null
+++ b/ql/ql/src/queries/style/AcronymsShouldBeCamelCase.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Acronyms should be PascalCase/camelCase.
+ * @description Acronyms should be PascalCase/camelCase instead of upper-casing all the letters.
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/acronyms-should-be-pascal-case
+ * @tags correctness
+ *       maintainability
+ * @precision high
+ */
+
+import ql
+import codeql_ql.style.AcronymsShouldBeCamelCaseQuery
+
+from string name, AstNode node
+where shouldBePascalCased(name, node, _)
+select node, "Acronyms should be PascalCase/camelCase"
diff --git a/ql/ql/src/queries/style/DeadCode.ql b/ql/ql/src/queries/style/DeadCode.ql
new file mode 100644
index 00000000000..e5fbf8c043a
--- /dev/null
+++ b/ql/ql/src/queries/style/DeadCode.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Dead code
+ * @description Code that cannot be reached should be deleted.
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/dead-code
+ * @precision very-high
+ */
+
+import ql
+import codeql_ql.style.DeadCodeQuery
+
+from AstNode node
+where isDead(node)
+select node, "Code is dead"
diff --git a/ql/ql/src/queries/style/FieldOnlyUsedInCharPred.ql b/ql/ql/src/queries/style/FieldOnlyUsedInCharPred.ql
new file mode 100644
index 00000000000..aaf5fadf79f
--- /dev/null
+++ b/ql/ql/src/queries/style/FieldOnlyUsedInCharPred.ql
@@ -0,0 +1,25 @@
+/**
+ * @name Field only used in CharPred
+ * @description A field only being used in the charpred suggests that the field should be inlined into the charpred.
+ * @kind problem
+ * @problem.severity recommendation
+ * @id ql/field-only-used-in-charpred
+ * @tags maintainability
+ * @precision very-high
+ */
+
+import ql
+
+from Class c, FieldDecl f
+where
+  c.getAField() = f and
+  forex(FieldAccess access | access.getDeclaration() = f |
+    access.getEnclosingPredicate() = c.getCharPred()
+  ) and
+  // excluding fields that are uniquely used in call to an IPA constructor
+  not unique(FieldAccess access | access.getDeclaration() = f | access) =
+    any(PredicateCall call |
+      call.getEnclosingPredicate() = c.getCharPred() and call.getTarget() instanceof NewTypeBranch
+    ).getAnArgument() and
+  not f.getVarDecl().overrides(_)
+select f, "Field is only used in CharPred"
diff --git a/ql/ql/src/queries/style/MissingSecurityMetadata.ql b/ql/ql/src/queries/style/MissingSecurityMetadata.ql
new file mode 100644
index 00000000000..10f50fb3f99
--- /dev/null
+++ b/ql/ql/src/queries/style/MissingSecurityMetadata.ql
@@ -0,0 +1,54 @@
+/**
+ * @name Missing security metadata
+ * @description Security queries should have both a `@tag security` and a `@security-severity` tag.
+ * @kind problem
+ * @problem.severity warning
+ * @precision very-high
+ * @id ql/missing-security-metadata
+ * @tags correctness
+ */
+
+import ql
+
+predicate missingSecuritySeverity(QLDoc doc) {
+  exists(string s | s = doc.getContents() |
+    exists(string securityTag | securityTag = s.splitAt("@") |
+      securityTag.matches("tags%security%")
+    ) and
+    exists(string precisionTag | precisionTag = s.splitAt("@") |
+      precisionTag.matches("precision %")
+    ) and
+    not exists(string securitySeverity | securitySeverity = s.splitAt("@") |
+      securitySeverity.matches("security-severity %")
+    )
+  )
+}
+
+predicate missingSecurityTag(QLDoc doc) {
+  exists(string s | s = doc.getContents() |
+    exists(string securitySeverity | securitySeverity = s.splitAt("@") |
+      securitySeverity.matches("security-severity %")
+    ) and
+    exists(string precisionTag | precisionTag = s.splitAt("@") |
+      precisionTag.matches("precision %")
+    ) and
+    not exists(string securityTag | securityTag = s.splitAt("@") |
+      securityTag.matches("tags%security%")
+    )
+  )
+}
+
+from TopLevel t, string msg
+where
+  t.getLocation().getFile().getBaseName().matches("%.ql") and
+  not t.getLocation()
+      .getFile()
+      .getRelativePath()
+      .matches("%/" + ["experimental", "examples", "test"] + "/%") and
+  (
+    missingSecuritySeverity(t.getQLDoc()) and
+    msg = "This query file is missing a `@security-severity` tag."
+    or
+    missingSecurityTag(t.getQLDoc()) and msg = "This query file is missing a `@tag security`."
+  )
+select t, msg
diff --git a/ql/ql/src/queries/style/NameCasing.ql b/ql/ql/src/queries/style/NameCasing.ql
new file mode 100644
index 00000000000..a5accd3dd70
--- /dev/null
+++ b/ql/ql/src/queries/style/NameCasing.ql
@@ -0,0 +1,42 @@
+/**
+ * @name Correct casing on name declaraions
+ * @description Variables/fields/predicates should be lower-case, classes/modules should be upper-case
+ * @kind problem
+ * @problem.severity error
+ * @id ql/name-casing
+ * @tags correctness
+ * @precision very-high
+ */
+
+import ql
+import codeql_ql.style.AcronymsShouldBeCamelCaseQuery as AcronymsQuery
+
+predicate shouldBeUpperCase(AstNode node, string name, string kind) {
+  name = AcronymsQuery::getName(node, kind) and
+  kind = ["class", "newtypeBranch", "newtype", "module", "import"]
+}
+
+predicate shouldBeLowerCase(AstNode node, string name, string kind) {
+  name = AcronymsQuery::getName(node, kind) and
+  not shouldBeUpperCase(node, name, kind)
+}
+
+string prettyKind(string kind) {
+  exists(string prettyLower | prettyLower = AcronymsQuery::prettyPluralKind(kind) |
+    result = prettyLower.prefix(1).toUpperCase() + prettyLower.suffix(1)
+  )
+}
+
+from string name, AstNode node, string message, string kind
+where
+  (
+    shouldBeLowerCase(node, name, kind) and
+    name.regexpMatch("[^a-z].*") and
+    message = "a lowercase"
+    or
+    shouldBeUpperCase(node, name, kind) and
+    name.regexpMatch("[^A-Z].*") and
+    message = "an uppercase"
+  ) and
+  not node.hasAnnotation("deprecated")
+select node, prettyKind(kind) + " should start with " + message + " letter."
diff --git a/ql/ql/src/queries/style/NonDocBlock.ql b/ql/ql/src/queries/style/NonDocBlock.ql
new file mode 100644
index 00000000000..17d39eb9bdb
--- /dev/null
+++ b/ql/ql/src/queries/style/NonDocBlock.ql
@@ -0,0 +1,52 @@
+/**
+ * @name Block comment that is not QLDoc
+ * @description Placing a block comment that could have been a QLDoc comment is an indication that it should have been a QLDoc comment.
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/non-doc-block
+ * @tags maintainability
+ * @precision very-high
+ */
+
+import ql
+
+predicate canHaveQLDoc(AstNode node) {
+  node instanceof Class
+  or
+  node instanceof Module
+  or
+  node instanceof ClasslessPredicate
+  or
+  node instanceof ClassPredicate
+}
+
+pragma[noinline]
+int getLineAboveNodeThatCouldHaveDoc(File file) {
+  exists(AstNode node | canHaveQLDoc(node) |
+    result = node.getLocation().getStartLine() - 1 and file = node.getLocation().getFile()
+  )
+}
+
+pragma[noinline]
+BlockComment getACommentThatCouldBeQLDoc(File file) {
+  file = result.getLocation().getFile() and
+  result.getLocation().getEndLine() = getLineAboveNodeThatCouldHaveDoc(file) and
+  result.getLocation().getFile().getExtension() = "qll" and
+  not result.getContents().matches("/**%")
+}
+
+pragma[noinline]
+BlockComment getCommentAt(File file, int endLine) {
+  result = getACommentThatCouldBeQLDoc(file) and
+  result.getLocation().getEndLine() = endLine
+}
+
+from AstNode node, BlockComment comment
+where
+  canHaveQLDoc(node) and
+  not exists(node.getQLDoc()) and
+  not node.(ClassPredicate).isOverride() and // ignore override predicates
+  not node.hasAnnotation("deprecated") and // ignore deprecated
+  not node.hasAnnotation("private") and // ignore private
+  comment = getCommentAt(node.getLocation().getFile(), node.getLocation().getStartLine() - 1)
+select comment, "Block comment could be QLDoc for $@.", node, "the below code"
diff --git a/ql/ql/src/queries/style/ToStringInQueryLogic.ql b/ql/ql/src/queries/style/ToStringInQueryLogic.ql
index ff945bbcc55..cff68cae532 100644
--- a/ql/ql/src/queries/style/ToStringInQueryLogic.ql
+++ b/ql/ql/src/queries/style/ToStringInQueryLogic.ql
@@ -143,10 +143,6 @@ module DataFlow {
     override string toString() { result = p.toString() }
   }
 
-  newtype TReturnKind =
-    TNormalReturnKind() or
-    TParameterOutKind(int i) { any(Parameter p).getIndex() = i }
-
   /** A data flow node that represents the output of a call at the call site. */
   abstract class OutNode extends Node {
     /** Gets the underlying call. */
diff --git a/ql/ql/test/queries/bugs/OrderByConst/Foo.qll b/ql/ql/test/queries/bugs/OrderByConst/Foo.qll
new file mode 100644
index 00000000000..7229564660e
--- /dev/null
+++ b/ql/ql/test/queries/bugs/OrderByConst/Foo.qll
@@ -0,0 +1,10 @@
+string foo() {
+  result = concat(string x | x = [0 .. 10].toString() | x order by x desc, ", ") // BAD
+  or
+  result = concat(string x | x = [0 .. 10].toString() | x, ", " order by x desc) // GOOD
+}
+
+class Even extends int {
+  bindingset[this]
+  Even() { this % 2 = 0 }
+}
diff --git a/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.expected b/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.expected
new file mode 100644
index 00000000000..798c9f75a6c
--- /dev/null
+++ b/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.expected
@@ -0,0 +1 @@
+| Foo.qll:2:76:2:79 | String | Ordering $@ by a constant. | Foo.qll:2:12:2:80 | FullAggregate[concat] | concat aggregate |
diff --git a/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref b/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref
new file mode 100644
index 00000000000..809589a856f
--- /dev/null
+++ b/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref
@@ -0,0 +1 @@
+queries/bugs/OrderByConst.ql
\ No newline at end of file
diff --git a/ql/ql/test/queries/style/DeadCode/DeadCode.expected b/ql/ql/test/queries/style/DeadCode/DeadCode.expected
new file mode 100644
index 00000000000..d3b3115e729
--- /dev/null
+++ b/ql/ql/test/queries/style/DeadCode/DeadCode.expected
@@ -0,0 +1,2 @@
+| Foo.qll:2:11:2:38 | ClasslessPredicate dead1 | Code is dead |
+| Foo.qll:6:3:6:30 | ClasslessPredicate dead2 | Code is dead |
diff --git a/ql/ql/test/queries/style/DeadCode/DeadCode.qlref b/ql/ql/test/queries/style/DeadCode/DeadCode.qlref
new file mode 100644
index 00000000000..ac615af4961
--- /dev/null
+++ b/ql/ql/test/queries/style/DeadCode/DeadCode.qlref
@@ -0,0 +1 @@
+queries/style/DeadCode.ql
\ No newline at end of file
diff --git a/ql/ql/test/queries/style/DeadCode/Foo.qll b/ql/ql/test/queries/style/DeadCode/Foo.qll
new file mode 100644
index 00000000000..c0342776995
--- /dev/null
+++ b/ql/ql/test/queries/style/DeadCode/Foo.qll
@@ -0,0 +1,9 @@
+private module Mixed {
+  private predicate dead1() { none() }
+
+  predicate alive1() { none() }
+
+  predicate dead2() { none() }
+}
+
+predicate usesAlive() { Mixed::alive1() }
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.expected b/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.expected
new file mode 100644
index 00000000000..22b3ffdc817
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.expected
@@ -0,0 +1,2 @@
+| testcases/BadNoSecurity.ql:1:1:15:9 | TopLevel | This query file is missing a `@tag security`. |
+| testcases/BadNoSeverity.ql:1:1:15:9 | TopLevel | This query file is missing a `@security-severity` tag. |
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref b/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref
new file mode 100644
index 00000000000..c697bcee82e
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref
@@ -0,0 +1 @@
+queries/style/MissingSecurityMetadata.ql
\ No newline at end of file
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.expected b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql
new file mode 100644
index 00000000000..ad85013171e
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Some query
+ * @description Some description
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 10.0
+ * @precision very-high
+ * @id ql/some-query
+ * @tags quality
+ */
+
+import ql
+
+from Class c
+select c
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.expected b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql
new file mode 100644
index 00000000000..7e9ab50dcd5
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Some query
+ * @description Some description
+ * @kind problem
+ * @problem.severity warning
+ * @precision very-high
+ * @id ql/some-query
+ * @tags quality
+ *       security
+ */
+
+import ql
+
+from Class c
+select c
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/Good.expected b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/Good.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/Good.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/Good.ql
new file mode 100644
index 00000000000..dc668a1ced4
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/Good.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Some query
+ * @description Some description
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 10.0
+ * @precision very-high
+ * @id ql/some-query
+ * @tags quality
+ *       security
+ */
+
+import ql
+
+from Class c
+select c
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoPrecision.expected b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoPrecision.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoPrecision.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoPrecision.ql
new file mode 100644
index 00000000000..7f048f5a77a
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoPrecision.ql
@@ -0,0 +1,14 @@
+/**
+ * @name Some query
+ * @description Some description
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/some-query
+ * @tags quality
+ *       security
+ */
+
+import ql
+
+from Class c
+select c
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoSecurity.expected b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoSecurity.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoSecurity.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoSecurity.ql
new file mode 100644
index 00000000000..bc2a7632c1a
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNoSecurity.ql
@@ -0,0 +1,14 @@
+/**
+ * @name Some query
+ * @description Some description
+ * @kind problem
+ * @problem.severity warning
+ * @precision very-high
+ * @id ql/some-query
+ * @tags quality
+ */
+
+import ql
+
+from Class c
+select c
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNotAQuery.qll b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNotAQuery.qll
new file mode 100644
index 00000000000..523e9918c98
--- /dev/null
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/GoodNotAQuery.qll
@@ -0,0 +1,3 @@
+import ql
+
+FieldDecl getAField(Class c) { result = c.getAField() }
diff --git a/ruby/ql/consistency-queries/RegExpConsistency.ql b/ruby/ql/consistency-queries/RegExpConsistency.ql
new file mode 100644
index 00000000000..6155b86b7ce
--- /dev/null
+++ b/ruby/ql/consistency-queries/RegExpConsistency.ql
@@ -0,0 +1,19 @@
+import codeql.ruby.security.performance.RegExpTreeView
+
+query predicate nonUniqueChild(RegExpParent parent, int i, RegExpTerm child) {
+  child = parent.getChild(i) and
+  strictcount(parent.getChild(i)) > 1
+}
+
+query predicate cyclic(RegExpParent parent) { parent = parent.getAChild+() }
+
+query predicate nonConsecutive(RegExpParent parent, int i) {
+  exists(parent.getChild(i)) and
+  i > 0 and
+  not exists(parent.getChild(i - 1))
+}
+
+query predicate regExpNormalNonUniqueCharValue(RegExpNormalChar term, string value) {
+  value = term.getValue() and
+  strictcount(term.getValue()) > 1
+}
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 1375344ef2c..1c0bd7abbbc 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.0.11
+
+### Minor Analysis Improvements
+
+* The `Regex` class is now an abstract class that extends `StringlikeLiteral` with implementations for `RegExpLiteral` and string literals that 'flow' into functions that are known to interpret string arguments as regular expressions such as `Regex.new` and `String.match`.
+* The regular expression parser now groups sequences of normal characters. This reduces the number of instances of `RegExpNormalChar`.
+
 ## 0.0.10
 
 ### Minor Analysis Improvements
diff --git a/ruby/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md b/ruby/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
new file mode 100644
index 00000000000..a79f286aacd
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2022-02-07-deprecated-acronyms.md
@@ -0,0 +1,5 @@
+---
+category: deprecated
+---
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+  The old name still exists as a deprecated alias.
\ No newline at end of file
diff --git a/ruby/ql/lib/change-notes/2022-02-25-regex-group-characters.md b/ruby/ql/lib/change-notes/2022-02-25-regex-group-characters.md
deleted file mode 100644
index 615fe002313..00000000000
--- a/ruby/ql/lib/change-notes/2022-02-25-regex-group-characters.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The regular expression parser now groups sequences of normal characters. This reduces the number of instances of `RegExpNormalChar`.
diff --git a/ruby/ql/lib/change-notes/2022-02-28-orm-write-access.md b/ruby/ql/lib/change-notes/2022-02-28-orm-write-access.md
new file mode 100644
index 00000000000..f1320322287
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2022-02-28-orm-write-access.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added `OrmWriteAccess` concept to model data written to a database using an object-relational mapping (ORM) library.
diff --git a/ruby/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md b/ruby/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
new file mode 100644
index 00000000000..3481d507db3
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2022-03-14-taint-interface-cleanup.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The flow state variants of `isBarrier` and `isAdditionalFlowStep` are no longer exposed in the taint tracking library. The `isSanitizer` and `isAdditionalTaintStep` predicates should be used instead.
diff --git a/ruby/ql/lib/change-notes/2022-03-16-string-escape-sequences.md b/ruby/ql/lib/change-notes/2022-03-16-string-escape-sequences.md
new file mode 100644
index 00000000000..97b716e2bde
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2022-03-16-string-escape-sequences.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* `getConstantValue()` now returns the contents of strings and symbols after escape sequences have been interpreted. For example, for the Ruby string literal `"\n"`, `getConstantValue().getString()` previously returned a QL string with two characters, a backslash followed by `n`; now it returns the single-character string "\n" (U+000A, known as newline).
+* `getConstantValue().getInt()` previously returned incorrect values for integers larger than 2<sup>31</sup>-1 (the largest value that can be represented by the QL `int` type). It now returns no result in those cases.
diff --git a/ruby/ql/lib/change-notes/2022-02-28-regex-string-literals.md b/ruby/ql/lib/change-notes/released/0.0.11.md
similarity index 60%
rename from ruby/ql/lib/change-notes/2022-02-28-regex-string-literals.md
rename to ruby/ql/lib/change-notes/released/0.0.11.md
index 02288590aad..80af7ad606e 100644
--- a/ruby/ql/lib/change-notes/2022-02-28-regex-string-literals.md
+++ b/ruby/ql/lib/change-notes/released/0.0.11.md
@@ -1,4 +1,6 @@
----
-category: minorAnalysis
----
+## 0.0.11
+
+### Minor Analysis Improvements
+
 * The `Regex` class is now an abstract class that extends `StringlikeLiteral` with implementations for `RegExpLiteral` and string literals that 'flow' into functions that are known to interpret string arguments as regular expressions such as `Regex.new` and `String.match`.
+* The regular expression parser now groups sequences of normal characters. This reduces the number of instances of `RegExpNormalChar`.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/ruby/ql/lib/codeql/NumberUtils.qll b/ruby/ql/lib/codeql/NumberUtils.qll
new file mode 100644
index 00000000000..3267c53e26e
--- /dev/null
+++ b/ruby/ql/lib/codeql/NumberUtils.qll
@@ -0,0 +1,129 @@
+/**
+ * Provides predicates for working with numeric values and their string
+ * representations.
+ */
+
+/**
+ * Gets the integer value of `binary` when interpreted as binary. `binary` must
+ * contain only the digits 0 and 1. For values greater than
+ * 01111111111111111111111111111111 (2^31-1, the maximum value that `int` can
+ * represent), there is no result.
+ *
+ * ```
+ * "0"       => 0
+ * "01"      => 1
+ * "1010101" => 85
+ * ```
+ */
+bindingset[binary]
+int parseBinaryInt(string binary) {
+  exists(string stripped | stripped = stripLeadingZeros(binary) |
+    stripped.length() <= 31 and
+    result >= 0 and
+    result =
+      sum(int index, string c, int digit |
+        c = stripped.charAt(index) and
+        digit = "01".indexOf(c)
+      |
+        twoToThe(stripped.length() - 1 - index) * digit
+      )
+  )
+}
+
+/**
+ * Gets the integer value of `hex` when interpreted as hex. `hex` must be a
+ * valid hexadecimal string. For values greater than 7FFFFFFF (2^31-1, the
+ * maximum value that `int` can represent), there is no result.
+ *
+ * ```
+ * "0"    => 0
+ * "FF"   => 255
+ * "f00d" => 61453
+ * ```
+ */
+bindingset[hex]
+int parseHexInt(string hex) {
+  exists(string stripped | stripped = stripLeadingZeros(hex) |
+    stripped.length() <= 8 and
+    result >= 0 and
+    result =
+      sum(int index, string c |
+        c = stripped.charAt(index)
+      |
+        sixteenToThe(stripped.length() - 1 - index) * toHex(c)
+      )
+  )
+}
+
+/**
+ * Gets the integer value of `octal` when interpreted as octal. `octal` must be
+ * a valid octal string containing only the digits 0-7. For values greater than
+ * 17777777777 (2^31-1, the maximum value that `int` can represent), there is no
+ * result.
+ *
+ * ```
+ * "0"        => 0
+ * "77"       => 63
+ * "76543210" => 16434824
+ * ```
+ */
+bindingset[octal]
+int parseOctalInt(string octal) {
+  exists(string stripped | stripped = stripLeadingZeros(octal) |
+    stripped.length() <= 11 and
+    result >= 0 and
+    result =
+      sum(int index, string c, int digit |
+        c = stripped.charAt(index) and
+        digit = "01234567".indexOf(c)
+      |
+        eightToThe(stripped.length() - 1 - index) * digit
+      )
+  )
+}
+
+/** Gets the integer value of the `hex` char. */
+private int toHex(string hex) {
+  hex = [0 .. 9].toString() and
+  result = hex.toInt()
+  or
+  result = 10 and hex = ["a", "A"]
+  or
+  result = 11 and hex = ["b", "B"]
+  or
+  result = 12 and hex = ["c", "C"]
+  or
+  result = 13 and hex = ["d", "D"]
+  or
+  result = 14 and hex = ["e", "E"]
+  or
+  result = 15 and hex = ["f", "F"]
+}
+
+/**
+ * Gets the value of 16 to the power of `n`. Holds only for `n` in the range
+ * 0..7 (inclusive).
+ */
+int sixteenToThe(int n) {
+  // 16**7 is the largest power of 16 that fits in an int.
+  n in [0 .. 7] and result = 1.bitShiftLeft(4 * n)
+}
+
+/**
+ * Gets the value of 8 to the power of `n`. Holds only for `n` in the range
+ * 0..10 (inclusive).
+ */
+int eightToThe(int n) {
+  // 8**10 is the largest power of 8 that fits in an int.
+  n in [0 .. 10] and result = 1.bitShiftLeft(3 * n)
+}
+
+/**
+ * Gets the value of 2 to the power of `n`. Holds only for `n` in the range
+ * 0..30 (inclusive).
+ */
+int twoToThe(int n) { n in [0 .. 30] and result = 1.bitShiftLeft(n) }
+
+/** Gets `s` with any leading "0" characters removed. */
+bindingset[s]
+private string stripLeadingZeros(string s) { result = s.regexpCapture("0*(.*)", 1) }
diff --git a/ruby/ql/lib/codeql/ruby/Concepts.qll b/ruby/ql/lib/codeql/ruby/Concepts.qll
index 66f5bbacd93..e08d9a2b9f5 100644
--- a/ruby/ql/lib/codeql/ruby/Concepts.qll
+++ b/ruby/ql/lib/codeql/ruby/Concepts.qll
@@ -625,6 +625,35 @@ module OrmInstantiation {
   }
 }
 
+/**
+ * A data flow node that writes persistent data.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `PersistentWriteAccess::Range` instead.
+ */
+class PersistentWriteAccess extends DataFlow::Node instanceof PersistentWriteAccess::Range {
+  /**
+   * Gets the data flow node corresponding to the written value.
+   */
+  DataFlow::Node getValue() { result = super.getValue() }
+}
+
+/** Provides a class for modeling new persistent write access APIs. */
+module PersistentWriteAccess {
+  /**
+   * A data flow node that writes persistent data.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `PersistentWriteAccess` instead.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets the data flow node corresponding to the written value.
+     */
+    abstract DataFlow::Node getValue();
+  }
+}
+
 /**
  * A data-flow node that may set or unset Cross-site request forgery protection.
  *
diff --git a/ruby/ql/lib/codeql/ruby/ast/Expr.qll b/ruby/ql/lib/codeql/ruby/ast/Expr.qll
index fb35d96a44d..8f7c4b3ac43 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Expr.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Expr.qll
@@ -24,21 +24,8 @@ class Expr extends Stmt, TExpr {
   }
 }
 
-/**
- * A reference to the current object. For example:
- * - `self == other`
- * - `self.method_name`
- * - `def self.method_name ... end`
- *
- * This also includes implicit references to the current object in method
- * calls.  For example, the method call `foo(123)` has an implicit `self`
- * receiver, and is equivalent to the explicit `self.foo(123)`.
- */
-class Self extends Expr, TSelf {
-  final override string getAPrimaryQlClass() { result = "Self" }
-
-  final override string toString() { result = "self" }
-}
+/** DEPRECATED: Use `SelfVariableAccess` instead. */
+deprecated class Self = SelfVariableAccess;
 
 /**
  * A sequence of expressions in the right-hand side of an assignment or
diff --git a/ruby/ql/lib/codeql/ruby/ast/Literal.qll b/ruby/ql/lib/codeql/ruby/ast/Literal.qll
index 1e1f5d27781..631a05279f1 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Literal.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Literal.qll
@@ -230,13 +230,18 @@ class StringTextComponent extends StringComponent, TStringTextComponentNonRegexp
 
   StringTextComponent() { this = TStringTextComponentNonRegexp(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = this.getRawText() }
 
   final override ConstantValue::ConstantStringValue getConstantValue() {
-    result.isString(g.getValue())
+    result.isString(this.getUnescapedText())
   }
 
   final override string getAPrimaryQlClass() { result = "StringTextComponent" }
+
+  /** Gets the text of this component as it appears in the source code. */
+  final string getRawText() { result = g.getValue() }
+
+  final private string getUnescapedText() { result = unescapeTextComponent(this.getRawText()) }
 }
 
 /**
@@ -247,13 +252,18 @@ class StringEscapeSequenceComponent extends StringComponent, TStringEscapeSequen
 
   StringEscapeSequenceComponent() { this = TStringEscapeSequenceComponentNonRegexp(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = this.getRawText() }
 
   final override ConstantValue::ConstantStringValue getConstantValue() {
-    result.isString(g.getValue())
+    result.isString(this.getUnescapedText())
   }
 
   final override string getAPrimaryQlClass() { result = "StringEscapeSequenceComponent" }
+
+  /** Gets the text of this component as it appears in the source code. */
+  final string getRawText() { result = g.getValue() }
+
+  final private string getUnescapedText() { result = unescapeEscapeSequence(this.getRawText()) }
 }
 
 /**
diff --git a/ruby/ql/lib/codeql/ruby/ast/Variable.qll b/ruby/ql/lib/codeql/ruby/ast/Variable.qll
index 943f76e16e2..a426e07a988 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Variable.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Variable.qll
@@ -201,7 +201,16 @@ class ClassVariableWriteAccess extends ClassVariableAccess, VariableWriteAccess
 /** An access to a class variable where the value is read. */
 class ClassVariableReadAccess extends ClassVariableAccess, VariableReadAccess { }
 
-/** An access to the `self` variable */
+/**
+ * An access to the `self` variable. For example:
+ * - `self == other`
+ * - `self.method_name`
+ * - `def self.method_name ... end`
+ *
+ * This also includes implicit references to the current object in method
+ * calls.  For example, the method call `foo(123)` has an implicit `self`
+ * receiver, and is equivalent to the explicit `self.foo(123)`.
+ */
 class SelfVariableAccess extends LocalVariableAccess instanceof SelfVariableAccessImpl {
   final override string getAPrimaryQlClass() { result = "SelfVariableAccess" }
 }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll
index 0c614f3ee85..acd4a80349a 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll
@@ -3,43 +3,23 @@ private import AST
 private import Constant
 private import TreeSitter
 private import codeql.ruby.controlflow.CfgNodes
+private import codeql.NumberUtils
 
 int parseInteger(Ruby::Integer i) {
   exists(string s | s = i.getValue().toLowerCase().replaceAll("_", "") |
     s.charAt(0) != "0" and
     result = s.toInt()
     or
-    exists(string str, string values, int shift |
-      s.matches("0b%") and
-      values = "01" and
-      str = s.suffix(2) and
-      shift = 1
-      or
-      s.matches("0x%") and
-      values = "0123456789abcdef" and
-      str = s.suffix(2) and
-      shift = 4
-      or
-      s.charAt(0) = "0" and
-      not s.charAt(1) = ["b", "x", "o"] and
-      values = "01234567" and
-      str = s.suffix(1) and
-      shift = 3
-      or
-      s.matches("0o%") and
-      values = "01234567" and
-      str = s.suffix(2) and
-      shift = 3
-    |
-      result =
-        sum(int index, string c, int v, int exp |
-          c = str.charAt(index) and
-          v = values.indexOf(c.toLowerCase()) and
-          exp = str.length() - index - 1
-        |
-          v.bitShiftLeft((str.length() - index - 1) * shift)
-        )
-    )
+    s.matches("0b%") and result = parseBinaryInt(s.suffix(2))
+    or
+    s.matches("0x%") and result = parseHexInt(s.suffix(2))
+    or
+    s.charAt(0) = "0" and
+    not s.charAt(1) = ["b", "x", "o"] and
+    result = parseOctalInt(s.suffix(1))
+    or
+    s.matches("0o%") and
+    result = parseOctalInt(s.suffix(2))
   )
 }
 
@@ -148,16 +128,85 @@ private class RequiredFileLiteralConstantValue extends RequiredConstantValue {
 
 private class RequiredStringTextComponentConstantValue extends RequiredConstantValue {
   override predicate requiredString(string s) {
-    s = any(Ruby::Token t | exists(TStringTextComponentNonRegexp(t))).getValue()
+    s =
+      unescapeTextComponent(any(Ruby::Token t | exists(TStringTextComponentNonRegexp(t))).getValue())
   }
 }
 
 private class RequiredStringEscapeSequenceComponentConstantValue extends RequiredConstantValue {
   override predicate requiredString(string s) {
-    s = any(Ruby::Token t | exists(TStringEscapeSequenceComponentNonRegexp(t))).getValue()
+    s =
+      unescapeEscapeSequence(any(Ruby::Token t | exists(TStringEscapeSequenceComponentNonRegexp(t)))
+            .getValue())
   }
 }
 
+/**
+ * Gets the string represented by the escape sequence in `escaped`. For example:
+ *
+ * ```
+ * \\     => \
+ * \141   => a
+ * \u0078 => x
+ * ```
+ */
+bindingset[escaped]
+string unescapeEscapeSequence(string escaped) {
+  result = unescapeKnownEscapeSequence(escaped)
+  or
+  // Any other character following a backslash is just that character.
+  not exists(unescapeKnownEscapeSequence(escaped)) and
+  result = escaped.suffix(1)
+}
+
+bindingset[escaped]
+private string unescapeKnownEscapeSequence(string escaped) {
+  escaped = "\\\\" and result = "\\"
+  or
+  escaped = "\\'" and result = "'"
+  or
+  escaped = "\\\"" and result = "\""
+  or
+  escaped = "\\a" and result = 7.toUnicode()
+  or
+  escaped = "\\b" and result = 8.toUnicode()
+  or
+  escaped = "\\t" and result = "\t"
+  or
+  escaped = "\\n" and result = "\n"
+  or
+  escaped = "\\v" and result = 11.toUnicode()
+  or
+  escaped = "\\f" and result = 12.toUnicode()
+  or
+  escaped = "\\r" and result = "\r"
+  or
+  escaped = "\\e" and result = 27.toUnicode()
+  or
+  escaped = "\\s" and result = " "
+  or
+  escaped = ["\\c?", "\\C-?"] and result = 127.toUnicode()
+  or
+  result = parseOctalInt(escaped.regexpCapture("\\\\([0-7]{1,3})", 1)).toUnicode()
+  or
+  result = parseHexInt(escaped.regexpCapture("\\\\x([0-9a-fA-F]{1,2})", 1)).toUnicode()
+  or
+  result = parseHexInt(escaped.regexpCapture("\\\\u([0-9a-fA-F]{4})", 1)).toUnicode()
+  or
+  result = parseHexInt(escaped.regexpCapture("\\\\u\\{([0-9a-fA-F]{1,6})\\}", 1)).toUnicode()
+}
+
+/**
+ * Gets the result of unescaping a string text component by replacing `\\` and
+ * `\'` with `\` and `'`, respectively.
+ *
+ * ```rb
+ * 'foo\\bar \'baz\'' # foo\bar 'baz'
+ * ```
+ */
+bindingset[text]
+string unescapeTextComponent(string text) { result = text.regexpReplaceAll("\\\\(['\\\\])", "$1") }
+
 class TRegExpComponent =
   TStringTextComponentRegexp or TStringEscapeSequenceComponentRegexp or
       TStringInterpolationComponentRegexp;
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
index 2ee32fd1038..e01bc6ab7c2 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
@@ -73,7 +73,7 @@ private module Cached {
       m = resolveConstantReadAccess(c.getReceiver())
       or
       m = enclosingModule(c).getModule() and
-      c.getReceiver() instanceof Self
+      c.getReceiver() instanceof SelfVariableAccess
     ) and
     result = resolveConstantReadAccess(c.getAnArgument())
   }
@@ -437,7 +437,7 @@ private module ResolveImpl {
         encl = enclosingModule(this) and
         result = [qualifiedModuleNameNonRec(encl, _, _), qualifiedModuleNameRec(encl, _, _)]
       |
-        this.getReceiver() instanceof Self
+        this.getReceiver() instanceof SelfVariableAccess
         or
         not exists(this.getReceiver())
       )
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
index b07e05ac2b2..375a91f5a7e 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
@@ -184,9 +184,7 @@ abstract class ScopeImpl extends AstNode, TScopeType {
 }
 
 private class ScopeRealImpl extends ScopeImpl, TScopeReal {
-  private Scope::Range range;
-
-  ScopeRealImpl() { range = toGenerated(this) }
+  ScopeRealImpl() { toGenerated(this) instanceof Scope::Range }
 
   override Variable getAVariableImpl() { result.getDeclaringScope() = this }
 }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll
index a72cc9c9797..1b633e6d3cb 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll
@@ -366,7 +366,23 @@ private module Cached {
 
   cached
   predicate isCapturedAccess(LocalVariableAccess access) {
-    access.getVariable().getDeclaringScope() != access.getCfgScope()
+    exists(Scope scope1, Scope scope2 |
+      scope1 = access.getVariable().getDeclaringScope() and
+      scope2 = access.getCfgScope() and
+      scope1 != scope2
+    |
+      if access instanceof SelfVariableAccess
+      then
+        // ```
+        // class C
+        //   def self.m // not a captured access
+        //   end
+        // end
+        // ```
+        not scope2 instanceof Toplevel or
+        not access = any(SingletonMethod m).getObject()
+      else any()
+    )
   }
 
   cached
@@ -659,10 +675,11 @@ private class ClassVariableAccessSynth extends ClassVariableAccessRealImpl,
 abstract class SelfVariableAccessImpl extends LocalVariableAccessImpl, TSelfVariableAccess { }
 
 private class SelfVariableAccessReal extends SelfVariableAccessImpl, TSelfReal {
-  private Ruby::Self self;
   private SelfVariable var;
 
-  SelfVariableAccessReal() { this = TSelfReal(self) and var = TSelfVariable(scopeOf(self)) }
+  SelfVariableAccessReal() {
+    exists(Ruby::Self self | this = TSelfReal(self) and var = TSelfVariable(scopeOf(self)))
+  }
 
   final override SelfVariable getVariableImpl() { result = var }
 
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll b/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll
index c862a5b66b5..467ada35d9b 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/CfgNodes.qll
@@ -14,7 +14,7 @@ class EntryNode extends CfgNode, TEntryNode {
 
   EntryNode() { this = TEntryNode(scope) }
 
-  final override EntryBasicBlock getBasicBlock() { result = CfgNode.super.getBasicBlock() }
+  final override EntryBasicBlock getBasicBlock() { result = super.getBasicBlock() }
 
   final override Location getLocation() { result = scope.getLocation() }
 
@@ -31,7 +31,7 @@ class AnnotatedExitNode extends CfgNode, TAnnotatedExitNode {
   /** Holds if this node represent a normal exit. */
   final predicate isNormal() { normal = true }
 
-  final override AnnotatedExitBasicBlock getBasicBlock() { result = CfgNode.super.getBasicBlock() }
+  final override AnnotatedExitBasicBlock getBasicBlock() { result = super.getBasicBlock() }
 
   final override Location getLocation() { result = scope.getLocation() }
 
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll
index 2d018ff616a..f0a6e4c0d4f 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll
@@ -1,4 +1,4 @@
-private import ruby as rb
+private import ruby as RB
 private import ControlFlowGraphImpl as Impl
 private import Completion as Comp
 private import codeql.ruby.ast.internal.Synthesis
@@ -6,11 +6,11 @@ private import Splitting as Splitting
 private import codeql.ruby.CFG as CFG
 
 /** The base class for `ControlFlowTree`. */
-class ControlFlowTreeBase extends rb::AstNode {
+class ControlFlowTreeBase extends RB::AstNode {
   ControlFlowTreeBase() { not any(Synthesis s).excludeFromControlFlowTree(this) }
 }
 
-class ControlFlowElement = rb::AstNode;
+class ControlFlowElement = RB::AstNode;
 
 class Completion = Comp::Completion;
 
@@ -69,6 +69,6 @@ predicate isAbnormalExitType(SuccessorType t) {
   t instanceof CFG::SuccessorTypes::ExitSuccessor
 }
 
-class Location = rb::Location;
+class Location = RB::Location;
 
 class Node = CFG::CfgNode;
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll b/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
index 08a0f1bd360..b8880b39829 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
@@ -233,6 +233,8 @@ module Ssa {
       )
     }
 
+    override SelfVariable getSourceVariable() { result = v }
+
     final override string toString() { result = "self (" + v.getDeclaringScope() + ")" }
 
     final override Location getLocation() { result = this.getControlFlowNode().getLocation() }
@@ -314,7 +316,7 @@ module Ssa {
     CapturedCallDefinition() {
       exists(Variable v, BasicBlock bb, int i |
         this.definesAt(v, bb, i) and
-        SsaImpl::capturedCallWrite(bb, i, v)
+        SsaImpl::capturedCallWrite(_, bb, i, v)
       )
     }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
index 621647defb1..87771a9f397 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
@@ -203,7 +203,7 @@ private module Cached {
           result = lookupMethod(tp, method) and
           if result.(Method).isPrivate()
           then
-            exists(Self self |
+            exists(SelfVariableAccess self |
               self = call.getReceiver().getExpr() and
               pragma[only_bind_out](self.getEnclosingModule().getModule().getSuperClass*()) =
                 pragma[only_bind_out](result.getEnclosingModule().getModule())
@@ -232,6 +232,18 @@ private module Cached {
     )
   }
 
+  /** Gets a viable run-time target for the call `call`. */
+  cached
+  DataFlowCallable viableCallable(DataFlowCall call) {
+    result = TCfgScope(getTarget(call.asCall())) and
+    not call.asCall().getExpr() instanceof YieldCall // handled by `lambdaCreation`/`lambdaCall`
+    or
+    exists(LibraryCallable callable |
+      result = TLibraryCallable(callable) and
+      call.asCall().getExpr() = callable.getACall()
+    )
+  }
+
   cached
   newtype TArgumentPosition =
     TSelfArgumentPosition() or
@@ -300,28 +312,14 @@ private DataFlow::LocalSourceNode trackInstance(Module tp, TypeTracker t) {
     )
     or
     // `self` in method
-    exists(Self self, Method enclosing |
-      self = result.asExpr().getExpr() and
-      enclosing = self.getEnclosingMethod() and
-      tp = enclosing.getEnclosingModule().getModule() and
-      not self.getEnclosingModule().getEnclosingMethod() = enclosing
-    )
+    tp = result.(SsaSelfDefinitionNode).getSelfScope().(Method).getEnclosingModule().getModule()
     or
     // `self` in singleton method
-    exists(Self self, MethodBase enclosing |
-      self = result.asExpr().getExpr() and
-      flowsToSingletonMethodObject(trackInstance(tp), enclosing) and
-      enclosing = self.getEnclosingMethod() and
-      not self.getEnclosingModule().getEnclosingMethod() = enclosing
-    )
+    flowsToSingletonMethodObject(trackInstance(tp), result.(SsaSelfDefinitionNode).getSelfScope())
     or
     // `self` in top-level
-    exists(Self self, Toplevel enclosing |
-      self = result.asExpr().getExpr() and
-      enclosing = self.getEnclosingModule() and
-      tp = TResolved("Object") and
-      not self.getEnclosingMethod().getEnclosingModule() = enclosing
-    )
+    result.(SsaSelfDefinitionNode).getSelfScope() instanceof Toplevel and
+    tp = TResolved("Object")
     or
     // a module or class
     exists(Module m |
@@ -371,7 +369,7 @@ private predicate singletonMethod(MethodBase method, Expr object) {
 
 pragma[nomagic]
 private predicate flowsToSingletonMethodObject(DataFlow::LocalSourceNode nodeFrom, MethodBase method) {
-  exists(DataFlow::LocalSourceNode nodeTo |
+  exists(DataFlow::Node nodeTo |
     nodeFrom.flowsTo(nodeTo) and
     singletonMethod(method, nodeTo.asExpr().getExpr())
   )
@@ -409,13 +407,8 @@ private DataFlow::LocalSourceNode trackSingletonMethod(MethodBase m, string name
   name = m.getName()
 }
 
-private DataFlow::Node selfInModule(Module tp) {
-  exists(Self self, ModuleBase enclosing |
-    self = result.asExpr().getExpr() and
-    enclosing = self.getEnclosingModule() and
-    tp = enclosing.getModule() and
-    not self.getEnclosingMethod().getEnclosingModule() = enclosing
-  )
+private SsaSelfDefinitionNode selfInModule(Module tp) {
+  tp = result.getSelfScope().(ModuleBase).getModule()
 }
 
 private DataFlow::LocalSourceNode trackModule(Module tp, TypeTracker t) {
@@ -442,17 +435,6 @@ private DataFlow::LocalSourceNode trackModule(Module tp) {
   result = trackModule(tp, TypeTracker::end())
 }
 
-/** Gets a viable run-time target for the call `call`. */
-DataFlowCallable viableCallable(DataFlowCall call) {
-  result = TCfgScope(getTarget(call.asCall())) and
-  not call.asCall().getExpr() instanceof YieldCall // handled by `lambdaCreation`/`lambdaCall`
-  or
-  exists(LibraryCallable callable |
-    result = TLibraryCallable(callable) and
-    call.asCall().getExpr() = callable.getACall()
-  )
-}
-
 /**
  * Holds if the set of viable implementations that can be called by `call`
  * might be improved by knowing the call context. This is the case if the
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index 80e351110d6..05145fc4917 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -70,6 +70,20 @@ module LocalFlow {
     )
   }
 
+  /** Gets the SSA definition node corresponding to the implicit `self` parameter for `m`. */
+  private SsaDefinitionNode getSelfParameterDefNode(MethodBase m) {
+    result.getDefinition().(Ssa::SelfDefinition).getSourceVariable().getDeclaringScope() = m
+  }
+
+  /**
+   * Holds if `nodeFrom` is a parameter node, and `nodeTo` is a corresponding SSA node.
+   */
+  predicate localFlowSsaParamInput(Node nodeFrom, Node nodeTo) {
+    nodeTo = getParameterDefNode(nodeFrom.(ParameterNode).getParameter())
+    or
+    nodeTo = getSelfParameterDefNode(nodeFrom.(SelfParameterNode).getMethod())
+  }
+
   /**
    * Holds if there is a local use-use flow step from `nodeFrom` to `nodeTo`
    * involving SSA definition `def`.
@@ -115,9 +129,6 @@ module LocalFlow {
   predicate localFlowStepCommon(Node nodeFrom, Node nodeTo) {
     localSsaFlowStep(nodeFrom, nodeTo)
     or
-    nodeFrom.(SelfParameterNode).getMethod() = nodeTo.asExpr().getExpr().getEnclosingCallable() and
-    nodeTo.asExpr().getExpr() instanceof Self
-    or
     nodeFrom.asExpr() = nodeTo.asExpr().(CfgNodes::ExprNodes::AssignExprCfgNode).getRhs()
     or
     nodeFrom.asExpr() = nodeTo.asExpr().(CfgNodes::ExprNodes::BlockArgumentCfgNode).getValue()
@@ -236,7 +247,7 @@ private module Cached {
     or
     defaultValueFlow(nodeTo.(ParameterNode).getParameter(), nodeFrom)
     or
-    nodeTo = LocalFlow::getParameterDefNode(nodeFrom.(ParameterNode).getParameter())
+    LocalFlow::localFlowSsaParamInput(nodeFrom, nodeTo)
     or
     nodeTo.(SynthReturnNode).getAnInput() = nodeFrom
     or
@@ -253,7 +264,7 @@ private module Cached {
     or
     defaultValueFlow(nodeTo.(ParameterNode).getParameter(), nodeFrom)
     or
-    nodeTo = LocalFlow::getParameterDefNode(nodeFrom.(ParameterNode).getParameter())
+    LocalFlow::localFlowSsaParamInput(nodeFrom, nodeTo)
     or
     LocalFlow::localSsaFlowStepUseUse(_, nodeFrom, nodeTo)
     or
@@ -275,27 +286,34 @@ private module Cached {
     LocalFlow::localSsaFlowStepUseUse(_, nodeFrom, nodeTo)
   }
 
+  private predicate entrySsaDefinition(SsaDefinitionNode n) {
+    n = LocalFlow::getParameterDefNode(_)
+    or
+    exists(Ssa::Definition def | def = n.getDefinition() |
+      def instanceof Ssa::SelfDefinition
+      or
+      def instanceof Ssa::CapturedEntryDefinition
+    )
+  }
+
   cached
   predicate isLocalSourceNode(Node n) {
     n instanceof ParameterNode
     or
-    // This case should not be needed once we have proper use-use flow
-    // for `self`. At that point, the `self`s returned by `trackInstance`
-    // in `DataFlowDispatch.qll` should refer to the post-update node,
-    // and we can remove this case.
-    n.asExpr().getExpr() instanceof Self
+    n instanceof PostUpdateNodes::ExprPostUpdateNode
     or
-    // Nodes that can't be reached from another parameter or expression.
-    not localFlowStepTypeTracker+(any(Node e |
-        e instanceof ExprNode
+    // Expressions that can't be reached from another entry definition or expression.
+    not localFlowStepTypeTracker+(any(Node n0 |
+        n0 instanceof ExprNode
         or
-        e instanceof ParameterNode
-      ), n)
+        entrySsaDefinition(n0)
+      ), n.(ExprNode))
     or
-    // Ensure all parameter SSA nodes are local sources -- this is needed by type tracking.
-    // Note that when the parameter has a default value, it will be reachable from an
-    // expression (the default value) and therefore won't be caught by the rule above.
-    n = LocalFlow::getParameterDefNode(_)
+    // Ensure all entry SSA definitions are local sources -- for parameters, this
+    // is needed by type tracking. Note that when the parameter has a default value,
+    // it will be reachable from an expression (the default value) and therefore
+    // won't be caught by the rule above.
+    entrySsaDefinition(n)
   }
 
   cached
@@ -358,6 +376,16 @@ class SsaDefinitionNode extends NodeImpl, TSsaDefinitionNode {
   override string toStringImpl() { result = def.toString() }
 }
 
+/** An SSA definition for a `self` variable. */
+class SsaSelfDefinitionNode extends LocalSourceNode, SsaDefinitionNode {
+  private SelfVariable self;
+
+  SsaSelfDefinitionNode() { self = def.getSourceVariable() }
+
+  /** Gets the scope in which the `self` variable is declared. */
+  Scope getSelfScope() { result = self.getDeclaringScope() }
+}
+
 /**
  * A value returning statement, viewed as a node in a data flow graph.
  *
@@ -745,13 +773,6 @@ predicate jumpStep(Node pred, Node succ) {
   SsaImpl::captureFlowOut(pred.(SsaDefinitionNode).getDefinition(),
     succ.(SsaDefinitionNode).getDefinition())
   or
-  exists(Self s, Method m |
-    s = succ.asExpr().getExpr() and
-    pred.(SelfParameterNode).getMethod() = m and
-    m = s.getEnclosingMethod() and
-    m != s.getEnclosingCallable()
-  )
-  or
   succ.asExpr().getExpr().(ConstantReadAccess).getValue() = pred.asExpr().getExpr()
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
index 8c11cd8b1a7..970fd17f011 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
@@ -1,4 +1,5 @@
 private import SsaImplCommon
+private import SsaImplSpecific as SsaImplSpecific
 private import codeql.ruby.AST
 private import codeql.ruby.CFG
 private import codeql.ruby.ast.Variable
@@ -40,58 +41,50 @@ private predicate capturedExitRead(AnnotatedExitBasicBlock bb, int i, LocalVaria
   i = bb.length()
 }
 
-private CfgScope getCaptureOuterCfgScope(CfgScope scope) {
-  result = scope.getOuterCfgScope() and
-  (
-    scope instanceof Block
-    or
-    scope instanceof Lambda
-  )
-}
-
-/** Holds if captured variable `v` is read inside `scope`. */
+/**
+ * Holds if captured variable `v` is read directly inside `scope`,
+ * or inside a (transitively) nested scope of `scope`.
+ */
 pragma[noinline]
 private predicate hasCapturedRead(Variable v, CfgScope scope) {
   any(LocalVariableReadAccess read |
-    read.getVariable() = v and scope = getCaptureOuterCfgScope*(read.getCfgScope())
+    read.getVariable() = v and scope = read.getCfgScope().getOuterCfgScope*()
   ).isCapturedAccess()
 }
 
+/**
+ * Holds if `v` is written inside basic block `bb`, which is in the immediate
+ * outer scope of `scope`.
+ */
+pragma[noinline]
+private predicate variableWriteInOuterScope(BasicBlock bb, LocalVariable v, CfgScope scope) {
+  SsaImplSpecific::variableWrite(bb, _, v, _) and
+  scope.getOuterCfgScope() = bb.getScope()
+}
+
 pragma[noinline]
 private predicate hasVariableWriteWithCapturedRead(BasicBlock bb, LocalVariable v, CfgScope scope) {
   hasCapturedRead(v, scope) and
-  exists(VariableWriteAccess write |
-    write = bb.getANode().getNode() and
-    write.getVariable() = v and
-    bb.getScope() = scope.getOuterCfgScope()
-  )
+  variableWriteInOuterScope(bb, v, scope)
 }
 
 /**
- * Holds if the call at index `i` in basic block `bb` may reach a callable
- * that reads captured variable `v`.
+ * Holds if the call `call` at index `i` in basic block `bb` may reach
+ * a callable that reads captured variable `v`.
  */
-private predicate capturedCallRead(BasicBlock bb, int i, LocalVariable v) {
+private predicate capturedCallRead(Call call, BasicBlock bb, int i, LocalVariable v) {
   exists(CfgScope scope |
     hasVariableWriteWithCapturedRead(bb.getAPredecessor*(), v, scope) and
-    bb.getNode(i).getNode() instanceof Call
+    call = bb.getNode(i).getNode()
   |
-    not scope instanceof Block
-    or
     // If the read happens inside a block, we restrict to the call that
     // contains the block
-    scope = any(MethodCall c | bb.getNode(i) = c.getAControlFlowNode()).getBlock()
+    not scope instanceof Block
+    or
+    scope = call.(MethodCall).getBlock()
   )
 }
 
-/** Holds if captured variable `v` is written inside `scope`. */
-pragma[noinline]
-private predicate hasCapturedWrite(Variable v, CfgScope scope) {
-  any(LocalVariableWriteAccess write |
-    write.getVariable() = v and scope = getCaptureOuterCfgScope*(write.getCfgScope())
-  ).isCapturedAccess()
-}
-
 /** Holds if `v` is read at index `i` in basic block `bb`. */
 private predicate variableReadActual(BasicBlock bb, int i, LocalVariable v) {
   exists(VariableReadAccess read |
@@ -104,21 +97,38 @@ predicate variableRead(BasicBlock bb, int i, LocalVariable v, boolean certain) {
   variableReadActual(bb, i, v) and
   certain = true
   or
-  capturedCallRead(bb, i, v) and
+  capturedCallRead(_, bb, i, v) and
   certain = false
   or
   capturedExitRead(bb, i, v) and
   certain = false
 }
 
+/**
+ * Holds if captured variable `v` is written directly inside `scope`,
+ * or inside a (transitively) nested scope of `scope`.
+ */
+pragma[noinline]
+private predicate hasCapturedWrite(Variable v, CfgScope scope) {
+  any(LocalVariableWriteAccess write |
+    write.getVariable() = v and scope = write.getCfgScope().getOuterCfgScope*()
+  ).isCapturedAccess()
+}
+
+/**
+ * Holds if `v` is read inside basic block `bb`, which is in the immediate
+ * outer scope of `scope`.
+ */
+pragma[noinline]
+private predicate variableReadActualInOuterScope(BasicBlock bb, LocalVariable v, CfgScope scope) {
+  variableReadActual(bb, _, v) and
+  bb.getScope() = scope.getOuterCfgScope()
+}
+
 pragma[noinline]
 private predicate hasVariableReadWithCapturedWrite(BasicBlock bb, LocalVariable v, CfgScope scope) {
   hasCapturedWrite(v, scope) and
-  exists(VariableReadAccess read |
-    read = bb.getANode().getNode() and
-    read.getVariable() = v and
-    bb.getScope() = scope.getOuterCfgScope()
-  )
+  variableReadActualInOuterScope(bb, v, scope)
 }
 
 cached
@@ -134,20 +144,20 @@ private module Cached {
   }
 
   /**
-   * Holds if the call at index `i` in basic block `bb` may reach a callable
+   * Holds if the call `call` at index `i` in basic block `bb` may reach a callable
    * that writes captured variable `v`.
    */
   cached
-  predicate capturedCallWrite(BasicBlock bb, int i, LocalVariable v) {
+  predicate capturedCallWrite(Call call, BasicBlock bb, int i, LocalVariable v) {
     exists(CfgScope scope |
       hasVariableReadWithCapturedWrite(bb.getASuccessor*(), v, scope) and
-      bb.getNode(i).getNode() instanceof Call
+      call = bb.getNode(i).getNode()
     |
-      not scope instanceof Block
-      or
       // If the write happens inside a block, we restrict to the call that
       // contains the block
-      scope = any(MethodCall c | bb.getNode(i) = c.getAControlFlowNode()).getBlock()
+      not scope instanceof Block
+      or
+      scope = call.(MethodCall).getBlock()
     )
   }
 
@@ -177,6 +187,26 @@ private module Cached {
     )
   }
 
+  pragma[noinline]
+  private predicate defReachesCallReadInOuterScope(
+    Definition def, Call call, LocalVariable v, CfgScope scope
+  ) {
+    exists(BasicBlock bb, int i |
+      ssaDefReachesRead(v, def, bb, i) and
+      capturedCallRead(call, bb, i, v) and
+      scope.getOuterCfgScope() = bb.getScope()
+    )
+  }
+
+  pragma[noinline]
+  private predicate hasCapturedEntryWrite(Definition entry, LocalVariable v, CfgScope scope) {
+    exists(BasicBlock bb, int i |
+      capturedEntryWrite(bb, i, v) and
+      entry.definesAt(v, bb, i) and
+      bb.getScope().getOuterCfgScope*() = scope
+    )
+  }
+
   /**
    * Holds if there is flow for a captured variable from the enclosing scope into a block.
    * ```rb
@@ -188,13 +218,35 @@ private module Cached {
    */
   cached
   predicate captureFlowIn(Definition def, Definition entry) {
-    exists(LocalVariable v, BasicBlock bb, int i |
+    exists(Call call, LocalVariable v, CfgScope scope |
+      defReachesCallReadInOuterScope(def, call, v, scope) and
+      hasCapturedEntryWrite(entry, v, scope)
+    |
+      // If the read happens inside a block, we restrict to the call that
+      // contains the block
+      not scope instanceof Block
+      or
+      scope = call.(MethodCall).getBlock()
+    )
+  }
+
+  private import codeql.ruby.dataflow.SSA
+
+  pragma[noinline]
+  private predicate defReachesExitReadInInnerScope(Definition def, LocalVariable v, CfgScope scope) {
+    exists(BasicBlock bb, int i |
       ssaDefReachesRead(v, def, bb, i) and
-      capturedCallRead(bb, i, v) and
-      exists(BasicBlock bb2, int i2 |
-        capturedEntryWrite(bb2, i2, v) and
-        entry.definesAt(v, bb2, i2)
-      )
+      capturedExitRead(bb, i, v) and
+      scope = bb.getScope().getOuterCfgScope*()
+    )
+  }
+
+  pragma[noinline]
+  private predicate hasCapturedExitRead(Definition exit, Call call, LocalVariable v, CfgScope scope) {
+    exists(BasicBlock bb, int i |
+      capturedCallWrite(call, bb, i, v) and
+      exit.definesAt(v, bb, i) and
+      bb.getScope() = scope.getOuterCfgScope()
     )
   }
 
@@ -210,13 +262,15 @@ private module Cached {
    */
   cached
   predicate captureFlowOut(Definition def, Definition exit) {
-    exists(LocalVariable v, BasicBlock bb, int i |
-      ssaDefReachesRead(v, def, bb, i) and
-      capturedExitRead(bb, i, v) and
-      exists(BasicBlock bb2, int i2 |
-        capturedCallWrite(bb2, i2, v) and
-        exit.definesAt(v, bb2, i2)
-      )
+    exists(Call call, LocalVariable v, CfgScope scope |
+      defReachesExitReadInInnerScope(def, v, scope) and
+      hasCapturedExitRead(exit, call, v, _)
+    |
+      // If the read happens inside a block, we restrict to the call that
+      // contains the block
+      not scope instanceof Block
+      or
+      scope = call.(MethodCall).getBlock()
     )
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll
index 19bf1d4f27d..eed0d050735 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll
@@ -287,20 +287,6 @@ private module SsaDefReaches {
     )
   }
 
-  /**
-   * Holds if the SSA definition of `v` at `def` reaches uncertain SSA definition
-   * `redef` in the same basic block, without crossing another SSA definition of `v`.
-   */
-  predicate ssaDefReachesUncertainDefWithinBlock(
-    SourceVariable v, Definition def, UncertainWriteDefinition redef
-  ) {
-    exists(BasicBlock bb, int rnk, int i |
-      ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaDef()) - 1 and
-      redef.definesAt(v, bb, i)
-    )
-  }
-
   /**
    * Same as `ssaRefRank()`, but restricted to a particular SSA definition `def`.
    */
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll
index b363dd526a3..2cda4fa0a32 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll
@@ -40,7 +40,7 @@ predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain)
   ) and
   certain = true
   or
-  SsaImpl::capturedCallWrite(bb, i, v) and
+  SsaImpl::capturedCallWrite(_, bb, i, v) and
   certain = false
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
index d17e3cf43f9..0e94ef1206a 100755
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
@@ -66,35 +66,53 @@ private CfgNodes::ExprNodes::VariableWriteAccessCfgNode variablesInPattern(
     )
 }
 
-/**
- * Holds if the additional step from `nodeFrom` to `nodeTo` should be included
- * in all global taint flow configurations.
- */
 cached
-predicate defaultAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-  // value of `case` expression into variables in patterns
-  exists(CfgNodes::ExprNodes::CaseExprCfgNode case, CfgNodes::ExprNodes::InClauseCfgNode clause |
-    nodeFrom.asExpr() = case.getValue() and
-    clause = case.getBranch(_) and
-    nodeTo.(SsaDefinitionNode).getDefinition().getControlFlowNode() =
-      variablesInPattern(clause.getPattern())
-  )
-  or
-  // operation involving `nodeFrom`
-  exists(CfgNodes::ExprNodes::OperationCfgNode op |
-    op = nodeTo.asExpr() and
-    op.getAnOperand() = nodeFrom.asExpr() and
-    not op.getExpr() instanceof AssignExpr
-  )
-  or
-  // string interpolation of `nodeFrom` into `nodeTo`
-  nodeFrom.asExpr() =
-    nodeTo.asExpr().(CfgNodes::ExprNodes::StringlikeLiteralCfgNode).getAComponent()
-  or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false)
-  or
-  // Although flow through arrays is modelled precisely using stores/reads, we still
-  // allow flow out of a _tainted_ array. This is needed in order to support taint-
-  // tracking configurations where the source is an array.
-  readStep(nodeFrom, any(DataFlow::Content::ArrayElementContent c), nodeTo)
+private module Cached {
+  /**
+   * Holds if the additional step from `nodeFrom` to `nodeTo` should be included
+   * in all global taint flow configurations.
+   */
+  cached
+  predicate defaultAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    // value of `case` expression into variables in patterns
+    exists(CfgNodes::ExprNodes::CaseExprCfgNode case, CfgNodes::ExprNodes::InClauseCfgNode clause |
+      nodeFrom.asExpr() = case.getValue() and
+      clause = case.getBranch(_) and
+      nodeTo.(SsaDefinitionNode).getDefinition().getControlFlowNode() =
+        variablesInPattern(clause.getPattern())
+    )
+    or
+    // operation involving `nodeFrom`
+    exists(CfgNodes::ExprNodes::OperationCfgNode op |
+      op = nodeTo.asExpr() and
+      op.getAnOperand() = nodeFrom.asExpr() and
+      not op.getExpr() instanceof AssignExpr
+    )
+    or
+    // string interpolation of `nodeFrom` into `nodeTo`
+    nodeFrom.asExpr() =
+      nodeTo.asExpr().(CfgNodes::ExprNodes::StringlikeLiteralCfgNode).getAComponent()
+    or
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false)
+    or
+    // Although flow through arrays is modelled precisely using stores/reads, we still
+    // allow flow out of a _tainted_ array. This is needed in order to support taint-
+    // tracking configurations where the source is an array.
+    readStep(nodeFrom, any(DataFlow::Content::ArrayElementContent c), nodeTo)
+  }
+
+  /**
+   * Holds if taint propagates from `nodeFrom` to `nodeTo` in exactly one local
+   * (intra-procedural) step.
+   */
+  cached
+  predicate localTaintStepCached(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    defaultAdditionalTaintStep(nodeFrom, nodeTo)
+    or
+    // Simple flow through library code is included in the exposed local
+    // step relation, even though flow is technically inter-procedural
+    FlowSummaryImpl::Private::Steps::summaryThroughStep(nodeFrom, nodeTo, false)
+  }
 }
+
+import Cached
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll
index a8cd0442489..2243bcd0ecf 100755
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll
@@ -20,14 +20,4 @@ predicate localExprTaint(CfgNodes::ExprCfgNode e1, CfgNodes::ExprCfgNode e2) {
   localTaint(DataFlow::exprNode(e1), DataFlow::exprNode(e2))
 }
 
-/**
- * Holds if taint propagates from `nodeFrom` to `nodeTo` in exactly one local
- * (intra-procedural) step.
- */
-predicate localTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-  defaultAdditionalTaintStep(nodeFrom, nodeTo)
-  or
-  // Simple flow through library code is included in the exposed local
-  // step relation, even though flow is technically inter-procedural
-  FlowSummaryImpl::Private::Steps::summaryThroughStep(nodeFrom, nodeTo, false)
-}
+predicate localTaintStep = localTaintStepCached/2;
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index 43555af1af9..b344ea9a864 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -64,13 +64,30 @@ abstract class Configuration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) { none() }
 
   /**
-   * Holds if `sink` is a relevant taint sink.
+   * Holds if `source` is a relevant taint source with the given initial
+   * `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
+
+  /**
+   * Holds if `sink` is a relevant taint sink
    *
    * The smaller this predicate is, the faster `hasFlow()` will converge.
    */
   // overridden to provide taint-tracking specific qldoc
   override predicate isSink(DataFlow::Node sink) { none() }
 
+  /**
+   * Holds if `sink` is a relevant taint sink accepting `state`.
+   *
+   * The smaller this predicate is, the faster `hasFlow()` will converge.
+   */
+  // overridden to provide taint-tracking specific qldoc
+  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
+
   /** Holds if the node `node` is a taint sanitizer. */
   predicate isSanitizer(DataFlow::Node node) { none() }
 
@@ -79,6 +96,16 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultTaintSanitizer(node)
   }
 
+  /**
+   * Holds if the node `node` is a taint sanitizer when the flow state is
+   * `state`.
+   */
+  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
+
+  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
+    this.isSanitizer(node, state)
+  }
+
   /** Holds if taint propagation into `node` is prohibited. */
   predicate isSanitizerIn(DataFlow::Node node) { none() }
 
@@ -107,6 +134,25 @@ abstract class Configuration extends DataFlow::Configuration {
     defaultAdditionalTaintStep(node1, node2)
   }
 
+  /**
+   * Holds if the additional taint propagation step from `node1` to `node2`
+   * must be taken into account in the analysis. This step is only applicable
+   * in `state1` and updates the flow state to `state2`.
+   */
+  predicate isAdditionalTaintStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    none()
+  }
+
+  final override predicate isAdditionalFlowStep(
+    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
+    DataFlow::FlowState state2
+  ) {
+    this.isAdditionalTaintStep(node1, state1, node2, state2)
+  }
+
   override predicate allowImplicitRead(DataFlow::Node node, DataFlow::Content c) {
     (this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
     defaultImplicitTaintRead(node, c)
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActionController.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActionController.qll
index e25cb103842..3912169ef39 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/ActionController.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/ActionController.qll
@@ -105,7 +105,7 @@ private class ActionControllerContextCall extends MethodCall {
   private ActionControllerControllerClass controllerClass;
 
   ActionControllerContextCall() {
-    this.getReceiver() instanceof Self and
+    this.getReceiver() instanceof SelfVariableAccess and
     this.getEnclosingModule() = controllerClass
   }
 
@@ -127,9 +127,7 @@ abstract class ParamsCall extends MethodCall {
  * ActionController parameters available via the `params` method.
  */
 class ParamsSource extends RemoteFlowSource::Range {
-  ParamsCall call;
-
-  ParamsSource() { this.asExpr().getExpr() = call }
+  ParamsSource() { this.asExpr().getExpr() instanceof ParamsCall }
 
   override string getSourceType() { result = "ActionController::Metal#params" }
 }
@@ -146,9 +144,7 @@ abstract class CookiesCall extends MethodCall {
  * ActionController parameters available via the `cookies` method.
  */
 class CookiesSource extends RemoteFlowSource::Range {
-  CookiesCall call;
-
-  CookiesSource() { this.asExpr().getExpr() = call }
+  CookiesSource() { this.asExpr().getExpr() instanceof CookiesCall }
 
   override string getSourceType() { result = "ActionController::Metal#cookies" }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActionDispatch.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActionDispatch.qll
index 97580a8174d..d956448e036 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/ActionDispatch.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/ActionDispatch.qll
@@ -573,15 +573,16 @@ module ActionDispatch {
    */
   private class ResourcesRoute extends RouteImpl, TResourcesRoute {
     RouteBlock parent;
-    string resource;
     string action;
     string httpMethod;
     string pathComponent;
 
     ResourcesRoute() {
-      this = TResourcesRoute(parent, method, action) and
-      method.getArgument(0).getConstantValue().isStringOrSymbol(resource) and
-      isDefaultResourceRoute(resource, httpMethod, pathComponent, action)
+      exists(string resource |
+        this = TResourcesRoute(parent, method, action) and
+        method.getArgument(0).getConstantValue().isStringOrSymbol(resource) and
+        isDefaultResourceRoute(resource, httpMethod, pathComponent, action)
+      )
     }
 
     override string getAPrimaryQlClass() { result = "ResourcesRoute" }
@@ -610,15 +611,16 @@ module ActionDispatch {
    */
   private class SingularResourceRoute extends RouteImpl, TResourceRoute {
     RouteBlock parent;
-    string resource;
     string action;
     string httpMethod;
     string pathComponent;
 
     SingularResourceRoute() {
-      this = TResourceRoute(parent, method, action) and
-      method.getArgument(0).getConstantValue().isStringOrSymbol(resource) and
-      isDefaultSingularResourceRoute(resource, httpMethod, pathComponent, action)
+      exists(string resource |
+        this = TResourceRoute(parent, method, action) and
+        method.getArgument(0).getConstantValue().isStringOrSymbol(resource) and
+        isDefaultSingularResourceRoute(resource, httpMethod, pathComponent, action)
+      )
     }
 
     override string getAPrimaryQlClass() { result = "SingularResourceRoute" }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActionView.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActionView.qll
index ab1158cfd04..2bbb7139239 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/ActionView.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/ActionView.qll
@@ -61,7 +61,7 @@ private class ActionViewHtmlEscapeCall extends HtmlEscapeCall {
 // A call in a context where some commonly used `ActionView` methods are available.
 private class ActionViewContextCall extends MethodCall {
   ActionViewContextCall() {
-    this.getReceiver() instanceof Self and
+    this.getReceiver() instanceof SelfVariableAccess and
     inActionViewContext(this)
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll
index 841629930d7..6f0d43fb2aa 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll
@@ -7,6 +7,7 @@ private import codeql.ruby.Concepts
 private import codeql.ruby.controlflow.CfgNodes
 private import codeql.ruby.DataFlow
 private import codeql.ruby.dataflow.internal.DataFlowDispatch
+private import codeql.ruby.dataflow.internal.DataFlowPrivate
 private import codeql.ruby.ast.internal.Module
 private import codeql.ruby.ApiGraphs
 private import codeql.ruby.frameworks.Stdlib
@@ -100,7 +101,7 @@ class ActiveRecordModelClassMethodCall extends MethodCall {
     recvCls = this.getReceiver().(ActiveRecordModelClassMethodCall).getReceiverClass()
     or
     // e.g. self.where(...) within an ActiveRecordModelClass
-    this.getReceiver() instanceof Self and
+    this.getReceiver() instanceof SelfVariableAccess and
     this.getEnclosingModule() = recvCls
   }
 
@@ -268,29 +269,30 @@ private Expr getUltimateReceiver(MethodCall call) {
 
 // A call to `find`, `where`, etc. that may return active record model object(s)
 private class ActiveRecordModelFinderCall extends ActiveRecordModelInstantiation, DataFlow::CallNode {
-  private MethodCall call;
   private ActiveRecordModelClass cls;
-  private Expr recv;
 
   ActiveRecordModelFinderCall() {
-    call = this.asExpr().getExpr() and
-    recv = getUltimateReceiver(call) and
-    resolveConstant(recv) = cls.getAQualifiedName() and
-    call.getMethodName() = finderMethodName()
+    exists(MethodCall call, Expr recv |
+      call = this.asExpr().getExpr() and
+      recv = getUltimateReceiver(call) and
+      resolveConstant(recv) = cls.getAQualifiedName() and
+      call.getMethodName() = finderMethodName()
+    )
   }
 
   final override ActiveRecordModelClass getClass() { result = cls }
 }
 
 // A `self` reference that may resolve to an active record model object
-private class ActiveRecordModelClassSelfReference extends ActiveRecordModelInstantiation {
+private class ActiveRecordModelClassSelfReference extends ActiveRecordModelInstantiation,
+  SsaSelfDefinitionNode {
   private ActiveRecordModelClass cls;
 
   ActiveRecordModelClassSelfReference() {
-    exists(Self s |
-      s.getEnclosingModule() = cls and
-      s.getEnclosingMethod() = cls.getAMethod() and
-      s = this.asExpr().getExpr()
+    exists(MethodBase m |
+      m = this.getCfgScope() and
+      m.getEnclosingModule() = cls and
+      m = cls.getAMethod()
     )
   }
 
@@ -314,3 +316,146 @@ private class ActiveRecordInstanceMethodCall extends DataFlow::CallNode {
 
   ActiveRecordInstance getInstance() { result = instance }
 }
+
+/**
+ * Provides modeling relating to the `ActiveRecord::Persistence` module.
+ */
+private module Persistence {
+  /**
+   * Holds if there is a hash literal argument to `call` at `argIndex`
+   * containing a KV pair with value `value`.
+   */
+  private predicate hashArgumentWithValue(
+    DataFlow::CallNode call, int argIndex, DataFlow::ExprNode value
+  ) {
+    exists(ExprNodes::HashLiteralCfgNode hash, ExprNodes::PairCfgNode pair |
+      hash = call.getArgument(argIndex).asExpr() and
+      pair = hash.getAKeyValuePair()
+    |
+      value.asExpr() = pair.getValue()
+    )
+  }
+
+  /**
+   * Holds if `call` has a keyword argument of with value `value`.
+   */
+  private predicate keywordArgumentWithValue(DataFlow::CallNode call, DataFlow::ExprNode value) {
+    exists(ExprNodes::PairCfgNode pair | pair = call.getArgument(_).asExpr() |
+      value.asExpr() = pair.getValue()
+    )
+  }
+
+  /** A call to e.g. `User.create(name: "foo")` */
+  private class CreateLikeCall extends DataFlow::CallNode, PersistentWriteAccess::Range {
+    CreateLikeCall() {
+      exists(this.asExpr().getExpr().(ActiveRecordModelClassMethodCall).getReceiverClass()) and
+      this.getMethodName() =
+        [
+          "create", "create!", "create_or_find_by", "create_or_find_by!", "find_or_create_by",
+          "find_or_create_by!", "insert", "insert!"
+        ]
+    }
+
+    override DataFlow::Node getValue() {
+      // attrs as hash elements in arg0
+      hashArgumentWithValue(this, 0, result) or
+      keywordArgumentWithValue(this, result)
+    }
+  }
+
+  /** A call to e.g. `User.update(1, name: "foo")` */
+  private class UpdateLikeClassMethodCall extends DataFlow::CallNode, PersistentWriteAccess::Range {
+    UpdateLikeClassMethodCall() {
+      exists(this.asExpr().getExpr().(ActiveRecordModelClassMethodCall).getReceiverClass()) and
+      this.getMethodName() = ["update", "update!", "upsert"]
+    }
+
+    override DataFlow::Node getValue() {
+      keywordArgumentWithValue(this, result)
+      or
+      // Case where 2 array args are passed - the first an array of IDs, and the
+      // second an array of hashes - each hash corresponding to an ID in the
+      // first array.
+      exists(ExprNodes::ArrayLiteralCfgNode hashesArray |
+        this.getArgument(0).asExpr() instanceof ExprNodes::ArrayLiteralCfgNode and
+        hashesArray = this.getArgument(1).asExpr()
+      |
+        exists(ExprNodes::HashLiteralCfgNode hash, ExprNodes::PairCfgNode pair |
+          hash = hashesArray.getArgument(_) and
+          pair = hash.getAKeyValuePair()
+        |
+          result.asExpr() = pair.getValue()
+        )
+      )
+    }
+  }
+
+  /** A call to e.g. `User.insert_all([{name: "foo"}, {name: "bar"}])` */
+  private class InsertAllLikeCall extends DataFlow::CallNode, PersistentWriteAccess::Range {
+    private ExprNodes::ArrayLiteralCfgNode arr;
+
+    InsertAllLikeCall() {
+      exists(this.asExpr().getExpr().(ActiveRecordModelClassMethodCall).getReceiverClass()) and
+      this.getMethodName() = ["insert_all", "insert_all!", "upsert_all"] and
+      arr = this.getArgument(0).asExpr()
+    }
+
+    override DataFlow::Node getValue() {
+      // attrs as hash elements of members of array arg0
+      exists(ExprNodes::HashLiteralCfgNode hash, ExprNodes::PairCfgNode pair |
+        hash = arr.getArgument(_) and
+        pair = hash.getAKeyValuePair()
+      |
+        result.asExpr() = pair.getValue()
+      )
+    }
+  }
+
+  /** A call to e.g. `user.update(name: "foo")` */
+  private class UpdateLikeInstanceMethodCall extends PersistentWriteAccess::Range,
+    ActiveRecordInstanceMethodCall {
+    UpdateLikeInstanceMethodCall() {
+      this.getMethodName() = ["update", "update!", "update_attributes", "update_attributes!"]
+    }
+
+    override DataFlow::Node getValue() {
+      // attrs as hash elements in arg0
+      hashArgumentWithValue(this, 0, result)
+      or
+      // keyword arg
+      keywordArgumentWithValue(this, result)
+    }
+  }
+
+  /** A call to e.g. `user.update_attribute(name, "foo")` */
+  private class UpdateAttributeCall extends PersistentWriteAccess::Range,
+    ActiveRecordInstanceMethodCall {
+    UpdateAttributeCall() { this.getMethodName() = "update_attribute" }
+
+    override DataFlow::Node getValue() {
+      // e.g. `foo.update_attribute(key, value)`
+      result = this.getArgument(1)
+    }
+  }
+
+  /**
+   * An assignment like `user.name = "foo"`. Though this does not write to the
+   * database without a subsequent call to persist the object, it is considered
+   * as an `PersistentWriteAccess` to avoid missing cases where the path to a
+   * subsequent write is not clear.
+   */
+  private class AssignAttribute extends PersistentWriteAccess::Range {
+    private ExprNodes::AssignExprCfgNode assignNode;
+
+    AssignAttribute() {
+      exists(DataFlow::CallNode setter |
+        assignNode = this.asExpr() and
+        setter.getArgument(0) = this and
+        setter instanceof ActiveRecordInstanceMethodCall and
+        setter.asExpr().getExpr() instanceof SetterMethodCall
+      )
+    }
+
+    override DataFlow::Node getValue() { assignNode.getRhs() = result.asExpr() }
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Files.qll b/ruby/ql/lib/codeql/ruby/frameworks/Files.qll
index 8ba0b96c2c1..40cc0c89b05 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Files.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Files.qll
@@ -69,7 +69,10 @@ abstract private class IOOrFileMethodCall extends DataFlow::CallNode {
   }
 
   /** Gets the API used to perform this call, either "IO" or "File" */
-  abstract string getAPI();
+  abstract string getApi();
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated string getAPI() { result = this.getApi() }
 
   /** Gets a node representing the data read or written by this call */
   abstract DataFlow::Node getADataNodeImpl();
@@ -110,7 +113,10 @@ private class IOOrFileReadMethodCall extends IOOrFileMethodCall {
     )
   }
 
-  override string getAPI() { result = api }
+  override string getApi() { result = api }
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated override string getAPI() { result = this.getApi() }
 
   override DataFlow::Node getADataNodeImpl() { result = this }
 
@@ -151,7 +157,10 @@ private class IOOrFileWriteMethodCall extends IOOrFileMethodCall {
     )
   }
 
-  override string getAPI() { result = api }
+  override string getApi() { result = api }
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated override string getAPI() { result = this.getApi() }
 
   override DataFlow::Node getADataNodeImpl() { result = dataNode }
 
@@ -180,12 +189,6 @@ module IO {
     }
   }
 
-  // "Direct" `IO` instances, i.e. cases where there is no more specific
-  // subtype such as `File`
-  private class IOInstanceStrict extends IOInstance {
-    IOInstanceStrict() { this = ioInstance() }
-  }
-
   /**
    * A `DataFlow::CallNode` that reads data using the `IO` class. For example,
    * the `read` and `readline` calls in:
@@ -202,7 +205,7 @@ module IO {
    * that use a subclass of `IO` such as `File`.
    */
   class IOReader extends IOOrFileReadMethodCall {
-    IOReader() { this.getAPI() = "IO" }
+    IOReader() { this.getApi() = "IO" }
   }
 
   /**
@@ -221,7 +224,7 @@ module IO {
    * that use a subclass of `IO` such as `File`.
    */
   class IOWriter extends IOOrFileWriteMethodCall {
-    IOWriter() { this.getAPI() = "IO" }
+    IOWriter() { this.getApi() = "IO" }
   }
 
   /**
@@ -306,7 +309,7 @@ module File {
    * ```
    */
   class FileModuleReader extends IO::FileReader {
-    FileModuleReader() { this.getAPI() = "File" }
+    FileModuleReader() { this.getApi() = "File" }
 
     override DataFlow::Node getADataNode() { result = this.getADataNodeImpl() }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll b/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll
index 8aa59d87084..51736fa192b 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll
@@ -221,7 +221,7 @@ private class GraphqlSchemaObjectClassMethodCall extends MethodCall {
     recvCls.getModule() = resolveConstantReadAccess(this.getReceiver())
     or
     // e.g. self.some_method(...) within a graphql Object or Interface
-    this.getReceiver() instanceof Self and
+    this.getReceiver() instanceof SelfVariableAccess and
     this.getEnclosingModule() = recvCls
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
index 4fbf89b4e44..5dd6db4f84e 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
@@ -18,20 +18,15 @@ module Kernel {
    * providing a specific receiver as in `Kernel.exit`.
    */
   class KernelMethodCall extends DataFlow::CallNode {
-    private MethodCall methodCall;
-
     KernelMethodCall() {
-      methodCall = this.asExpr().getExpr() and
+      this = API::getTopLevelMember("Kernel").getAMethodCall(_)
+      or
+      this.asExpr().getExpr() instanceof UnknownMethodCall and
       (
-        this = API::getTopLevelMember("Kernel").getAMethodCall(_)
+        this.getReceiver().asExpr().getExpr() instanceof SelfVariableAccess and
+        isPrivateKernelMethod(this.getMethodName())
         or
-        methodCall instanceof UnknownMethodCall and
-        (
-          this.getReceiver().asExpr().getExpr() instanceof Self and
-          isPrivateKernelMethod(methodCall.getMethodName())
-          or
-          isPublicKernelMethod(methodCall.getMethodName())
-        )
+        isPublicKernelMethod(this.getMethodName())
       )
     }
   }
diff --git a/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll b/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll
index 51e294c4f61..e22c00ddc47 100644
--- a/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll
@@ -176,8 +176,8 @@ private module RegexpMatching {
 }
 
 /** A class to test whether a regular expression matches certain HTML tags. */
-class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
-  HTMLMatchingRegExp() {
+class HtmlMatchingRegExp extends RegexpMatching::MatchedRegExp {
+  HtmlMatchingRegExp() {
     // the regexp must mention "<" and ">" explicitly.
     forall(string angleBracket | angleBracket = ["<", ">"] |
       any(RegExpConstant term | term.getValue().matches("%" + angleBracket + "%")).getRootTerm() =
@@ -204,12 +204,15 @@ class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
   }
 }
 
+/** DEPRECATED: Alias for HtmlMatchingRegExp */
+deprecated class HTMLMatchingRegExp = HtmlMatchingRegExp;
+
 /**
  * Holds if `regexp` matches some HTML tags, but misses some HTML tags that it should match.
  *
  * When adding a new case to this predicate, make sure the test string used in `matches(..)` calls are present in `HTMLMatchingRegExp::test` / `HTMLMatchingRegExp::testWithGroups`.
  */
-predicate isBadRegexpFilter(HTMLMatchingRegExp regexp, string msg) {
+predicate isBadRegexpFilter(HtmlMatchingRegExp regexp, string msg) {
   // CVE-2021-33829 - matching both "<!-- foo -->" and "<!-- foo --!>", but in different capture groups
   regexp.matches("<!-- foo -->") and
   regexp.matches("<!-- foo --!>") and
diff --git a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
index 60e152a06fc..f38a308a96d 100644
--- a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
@@ -13,8 +13,8 @@ import codeql.ruby.TaintTracking
 /**
  * Provides a taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
  */
-module ReflectedXSS {
-  import XSS::ReflectedXSS
+module ReflectedXss {
+  import XSS::ReflectedXss
 
   /**
    * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
@@ -33,7 +33,10 @@ module ReflectedXSS {
     }
 
     override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      isAdditionalXSSTaintStep(node1, node2)
+      isAdditionalXssTaintStep(node1, node2)
     }
   }
 }
+
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
diff --git a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
index 2a089050e5a..22419c2e401 100644
--- a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
@@ -11,8 +11,9 @@ import ruby
 import codeql.ruby.DataFlow
 import codeql.ruby.TaintTracking
 
-module StoredXSS {
-  import XSS::StoredXSS
+/** Provides a taint-tracking configuration for cross-site scripting vulnerabilities. */
+module StoredXss {
+  import XSS::StoredXss
 
   /**
    * A taint-tracking configuration for reasoning about Stored XSS.
@@ -34,7 +35,10 @@ module StoredXSS {
     }
 
     override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      isAdditionalXSSTaintStep(node1, node2)
+      isAdditionalXssTaintStep(node1, node2)
     }
   }
 }
+
+/** DEPRECATED: Alias for StoredXss */
+deprecated module StoredXSS = StoredXss;
diff --git a/ruby/ql/lib/codeql/ruby/security/XSS.qll b/ruby/ql/lib/codeql/ruby/security/XSS.qll
index 0c1c1576f2a..5e8277c702b 100644
--- a/ruby/ql/lib/codeql/ruby/security/XSS.qll
+++ b/ruby/ql/lib/codeql/ruby/security/XSS.qll
@@ -245,7 +245,7 @@ private module Shared {
   /**
    * An additional step that is preserves dataflow in the context of XSS.
    */
-  predicate isAdditionalXSSFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+  predicate isAdditionalXssFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     isFlowFromLocals(node1, node2)
     or
     isFlowFromControllerInstanceVariable(node1, node2)
@@ -254,6 +254,9 @@ private module Shared {
     or
     isFlowFromHelperMethod(node1, node2)
   }
+
+  /** DEPRECATED: Alias for isAdditionalXssFlowStep */
+  deprecated predicate isAdditionalXSSFlowStep = isAdditionalXssFlowStep/2;
 }
 
 /**
@@ -261,7 +264,7 @@ private module Shared {
  * "reflected cross-site scripting" vulnerabilities, as well as
  * extension points for adding your own.
  */
-module ReflectedXSS {
+module ReflectedXss {
   /** A data flow source for stored XSS vulnerabilities. */
   abstract class Source extends Shared::Source { }
 
@@ -277,7 +280,10 @@ module ReflectedXSS {
   /**
    * An additional step that is preserves dataflow in the context of reflected XSS.
    */
-  predicate isAdditionalXSSTaintStep = Shared::isAdditionalXSSFlowStep/2;
+  predicate isAdditionalXssTaintStep = Shared::isAdditionalXssFlowStep/2;
+
+  /** DEPRECATED: Alias for isAdditionalXssTaintStep */
+  deprecated predicate isAdditionalXSSTaintStep = isAdditionalXssTaintStep/2;
 
   /**
    * A source of remote user input, considered as a flow source.
@@ -285,6 +291,9 @@ module ReflectedXSS {
   class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
 }
 
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
+
 private module OrmTracking {
   /**
    * A data flow configuration to track flow from finder calls to field accesses.
@@ -298,7 +307,7 @@ private module OrmTracking {
     override predicate isSink(DataFlow2::Node sink) { sink instanceof DataFlow2::CallNode }
 
     override predicate isAdditionalFlowStep(DataFlow2::Node node1, DataFlow2::Node node2) {
-      Shared::isAdditionalXSSFlowStep(node1, node2)
+      Shared::isAdditionalXssFlowStep(node1, node2)
       or
       // Propagate flow through arbitrary method calls
       node2.(DataFlow2::CallNode).getReceiver() = node1
@@ -309,7 +318,8 @@ private module OrmTracking {
   }
 }
 
-module StoredXSS {
+/** Provides default sources, sinks and sanitizers for detecting stored cross-site scripting (XSS) vulnerabilities. */
+module StoredXss {
   /** A data flow source for stored XSS vulnerabilities. */
   abstract class Source extends Shared::Source { }
 
@@ -325,7 +335,10 @@ module StoredXSS {
   /**
    * An additional step that preserves dataflow in the context of stored XSS.
    */
-  predicate isAdditionalXSSTaintStep = Shared::isAdditionalXSSFlowStep/2;
+  predicate isAdditionalXssTaintStep = Shared::isAdditionalXssFlowStep/2;
+
+  /** DEPRECATED: Alias for isAdditionalXssTaintStep */
+  deprecated predicate isAdditionalXSSTaintStep = isAdditionalXssTaintStep/2;
 
   private class OrmFieldAsSource extends Source instanceof DataFlow2::CallNode {
     OrmFieldAsSource() {
@@ -341,3 +354,6 @@ module StoredXSS {
   private class FileSystemReadAccessAsSource extends Source instanceof FileSystemReadAccess { }
   // TODO: Consider `FileNameSource` flowing to script tag `src` attributes and similar
 }
+
+/** DEPRECATED: Alias for StoredXss */
+deprecated module StoredXSS = StoredXss;
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/ParseRegExp.qll b/ruby/ql/lib/codeql/ruby/security/performance/ParseRegExp.qll
index 23f397387bf..b40c1fc4d50 100644
--- a/ruby/ql/lib/codeql/ruby/security/performance/ParseRegExp.qll
+++ b/ruby/ql/lib/codeql/ruby/security/performance/ParseRegExp.qll
@@ -402,7 +402,8 @@ abstract class RegExp extends AST::StringlikeLiteral {
     not exists(int x, int y | this.backreference(x, y) and x <= start and y >= end) and
     not exists(int x, int y |
       this.pStyleNamedCharacterProperty(x, y, _) and x <= start and y >= end
-    )
+    ) and
+    not exists(int x, int y | this.multiples(x, y, _, _) and x <= start and y >= end)
   }
 
   predicate normalCharacter(int start, int end) {
@@ -488,7 +489,7 @@ abstract class RegExp extends AST::StringlikeLiteral {
     this.group(start, end) and
     exists(int nameEnd |
       this.namedGroupStart(start, nameEnd) and
-      result = this.getText().substring(start + 4, nameEnd - 1)
+      result = this.getText().substring(start + 3, nameEnd - 1)
     )
   }
 
@@ -861,6 +862,7 @@ abstract class RegExp extends AST::StringlikeLiteral {
    * Whether the text in the range start,end is an alternation
    */
   predicate alternation(int start, int end) {
+    not this.inCharSet(start) and
     this.topLevel(start, end) and
     exists(int less | this.subalternation(start, less, _) and less < end)
   }
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll b/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll
index 824eb9de7ae..91b2d1d0378 100644
--- a/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll
+++ b/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll
@@ -119,18 +119,18 @@ class EmptyPositiveSubPatttern extends RegExpSubPattern {
  * whose root node is not a disjunction.
  */
 class RegExpRoot extends RegExpTerm {
-  RegExpParent parent;
-
   RegExpRoot() {
-    exists(RegExpAlt alt |
-      alt.isRootTerm() and
-      this = alt.getAChild() and
-      parent = alt.getParent()
+    exists(RegExpParent parent |
+      exists(RegExpAlt alt |
+        alt.isRootTerm() and
+        this = alt.getAChild() and
+        parent = alt.getParent()
+      )
+      or
+      this.isRootTerm() and
+      not this instanceof RegExpAlt and
+      parent = this.getParent()
     )
-    or
-    this.isRootTerm() and
-    not this instanceof RegExpAlt and
-    parent = this.getParent()
   }
 
   /**
@@ -466,13 +466,14 @@ private module CharacterClasses {
    * An implementation of `CharacterClass` for \d, \s, and \w.
    */
   private class PositiveCharacterClassEscape extends CharacterClass {
-    RegExpTerm cc;
     string charClass;
 
     PositiveCharacterClassEscape() {
-      isEscapeClass(cc, charClass) and
-      this = getCanonicalCharClass(cc) and
-      charClass = ["d", "s", "w"]
+      exists(RegExpTerm cc |
+        isEscapeClass(cc, charClass) and
+        this = getCanonicalCharClass(cc) and
+        charClass = ["d", "s", "w"]
+      )
     }
 
     override string getARelevantChar() {
@@ -504,13 +505,14 @@ private module CharacterClasses {
    * An implementation of `CharacterClass` for \D, \S, and \W.
    */
   private class NegativeCharacterClassEscape extends CharacterClass {
-    RegExpTerm cc;
     string charClass;
 
     NegativeCharacterClassEscape() {
-      isEscapeClass(cc, charClass) and
-      this = getCanonicalCharClass(cc) and
-      charClass = ["D", "S", "W"]
+      exists(RegExpTerm cc |
+        isEscapeClass(cc, charClass) and
+        this = getCanonicalCharClass(cc) and
+        charClass = ["D", "S", "W"]
+      )
     }
 
     override string getARelevantChar() {
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/RegExpTreeView.qll b/ruby/ql/lib/codeql/ruby/security/performance/RegExpTreeView.qll
index c059f7f131c..e7f43e3088f 100644
--- a/ruby/ql/lib/codeql/ruby/security/performance/RegExpTreeView.qll
+++ b/ruby/ql/lib/codeql/ruby/security/performance/RegExpTreeView.qll
@@ -1,5 +1,6 @@
 private import codeql.ruby.ast.Literal as AST
 private import ParseRegExp
+private import codeql.NumberUtils
 import codeql.Locations
 private import codeql.ruby.DataFlow
 
@@ -82,7 +83,7 @@ class RegExpParent extends TRegExpParent {
 
   RegExpTerm getChild(int i) { none() }
 
-  RegExpTerm getAChild() { result = this.getChild(_) }
+  final RegExpTerm getAChild() { result = this.getChild(_) }
 
   int getNumChild() { result = count(this.getAChild()) }
 
@@ -254,12 +255,11 @@ newtype TRegExpParent =
 
 class RegExpQuantifier extends RegExpTerm, TRegExpQuantifier {
   int part_end;
-  boolean maybe_empty;
   boolean may_repeat_forever;
 
   RegExpQuantifier() {
     this = TRegExpQuantifier(re, start, end) and
-    re.qualifiedPart(start, part_end, end, maybe_empty, may_repeat_forever)
+    re.qualifiedPart(start, part_end, end, _, may_repeat_forever)
   }
 
   override RegExpTerm getChild(int i) {
@@ -420,7 +420,9 @@ class RegExpEscape extends RegExpNormalChar {
     result = this.getUnicode()
   }
 
-  predicate isIdentityEscape() { not this.getUnescaped() in ["n", "r", "t"] }
+  predicate isIdentityEscape() {
+    not this.getUnescaped() in ["n", "r", "t"] and not this.isUnicode()
+  }
 
   /**
    * Gets the text for this escape. That is e.g. "\w".
@@ -437,21 +439,8 @@ class RegExpEscape extends RegExpNormalChar {
    * E.g. for `\u0061` this returns "a".
    */
   private string getUnicode() {
-    exists(int codepoint | codepoint = sum(this.getHexValueFromUnicode(_)) |
-      result = codepoint.toUnicode()
-    )
-  }
-
-  /**
-   * Gets int value for the `index`th char in the hex number of the unicode escape.
-   * E.g. for `\u0061` and `index = 2` this returns 96 (the number `6` interpreted as hex).
-   */
-  private int getHexValueFromUnicode(int index) {
     this.isUnicode() and
-    exists(string hex, string char | hex = this.getText().suffix(2) |
-      char = hex.charAt(index) and
-      result = 16.pow(hex.length() - index - 1) * toHex(char)
-    )
+    result = parseHexInt(this.getText().suffix(2)).toUnicode()
   }
 
   string getUnescaped() { result = this.getText().suffix(1) }
@@ -459,26 +448,6 @@ class RegExpEscape extends RegExpNormalChar {
   override string getAPrimaryQlClass() { result = "RegExpEscape" }
 }
 
-/**
- * Gets the hex number for the `hex` char.
- */
-private int toHex(string hex) {
-  hex = [0 .. 9].toString() and
-  result = hex.toInt()
-  or
-  result = 10 and hex = ["a", "A"]
-  or
-  result = 11 and hex = ["b", "B"]
-  or
-  result = 12 and hex = ["c", "C"]
-  or
-  result = 13 and hex = ["d", "D"]
-  or
-  result = 14 and hex = ["e", "E"]
-  or
-  result = 15 and hex = ["f", "F"]
-}
-
 /**
  * A word boundary, that is, a regular expression term of the form `\b`.
  */
diff --git a/ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll b/ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll
index a77a0659f3b..c463d213920 100644
--- a/ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll
+++ b/ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll
@@ -34,7 +34,8 @@ private module Cached {
     CallStep() or
     ReturnStep() or
     StoreStep(ContentName content) or
-    LoadStep(ContentName content)
+    LoadStep(ContentName content) or
+    JumpStep()
 
   /** Gets the summary resulting from appending `step` to type-tracking summary `tt`. */
   cached
@@ -49,6 +50,9 @@ private module Cached {
       step = LoadStep(content) and result = MkTypeTracker(hasCall, "")
       or
       exists(string p | step = StoreStep(p) and content = "" and result = MkTypeTracker(hasCall, p))
+      or
+      step = JumpStep() and
+      result = MkTypeTracker(false, content)
     )
   }
 
@@ -67,6 +71,9 @@ private module Cached {
       )
       or
       step = StoreStep(content) and result = MkTypeBackTracker(hasReturn, "")
+      or
+      step = JumpStep() and
+      result = MkTypeBackTracker(false, content)
     )
   }
 
@@ -110,12 +117,17 @@ class StepSummary extends TStepSummary {
     exists(string content | this = StoreStep(content) | result = "store " + content)
     or
     exists(string content | this = LoadStep(content) | result = "load " + content)
+    or
+    this instanceof JumpStep and result = "jump"
   }
 }
 
 pragma[noinline]
 private predicate smallstepNoCall(Node nodeFrom, TypeTrackingNode nodeTo, StepSummary summary) {
   jumpStep(nodeFrom, nodeTo) and
+  summary = JumpStep()
+  or
+  levelStep(nodeFrom, nodeTo) and
   summary = LevelStep()
   or
   exists(string content |
diff --git a/ruby/ql/lib/codeql/ruby/typetracking/TypeTrackerSpecific.qll b/ruby/ql/lib/codeql/ruby/typetracking/TypeTrackerSpecific.qll
index 4b37115b4e2..1aeb5fe3a62 100644
--- a/ruby/ql/lib/codeql/ruby/typetracking/TypeTrackerSpecific.qll
+++ b/ruby/ql/lib/codeql/ruby/typetracking/TypeTrackerSpecific.qll
@@ -11,10 +11,32 @@ class Node = DataFlowPublic::Node;
 
 class TypeTrackingNode = DataFlowPublic::LocalSourceNode;
 
+/** Holds if there is a simple local flow step from `nodeFrom` to `nodeTo` */
 predicate simpleLocalFlowStep = DataFlowPrivate::localFlowStepTypeTracker/2;
 
+/**
+ * Holds if data can flow from `node1` to `node2` in a way that discards call contexts.
+ */
 predicate jumpStep = DataFlowPrivate::jumpStep/2;
 
+/**
+ * Holds if there is a summarized local flow step from `nodeFrom` to `nodeTo`,
+ * because there is direct flow from a parameter to a return. That is, summarized
+ * steps are not applied recursively.
+ */
+pragma[nomagic]
+private predicate summarizedLocalStep(Node nodeFrom, Node nodeTo) {
+  exists(DataFlowPublic::ParameterNode param, DataFlowPrivate::ReturningNode returnNode |
+    DataFlowPrivate::LocalFlow::getParameterDefNode(param.getParameter())
+        .(TypeTrackingNode)
+        .flowsTo(returnNode) and
+    callStep(nodeTo.asExpr(), nodeFrom, param)
+  )
+}
+
+/** Holds if there is a level step from `nodeFrom` to `nodeTo`. */
+predicate levelStep(Node nodeFrom, Node nodeTo) { summarizedLocalStep(nodeFrom, nodeTo) }
+
 /**
  * Gets the name of a possible piece of content. This will usually include things like
  *
@@ -45,6 +67,13 @@ private predicate viableParam(
   )
 }
 
+private predicate callStep(ExprNodes::CallCfgNode call, Node nodeFrom, Node nodeTo) {
+  exists(DataFlowDispatch::ParameterPosition pos |
+    argumentPositionMatch(call, nodeFrom, pos) and
+    viableParam(call, nodeTo, pos)
+  )
+}
+
 /**
  * Holds if `nodeFrom` steps to `nodeTo` by being passed as a parameter in a call.
  *
@@ -53,19 +82,13 @@ private predicate viableParam(
  * methods is done using API graphs (which uses type tracking).
  */
 predicate callStep(Node nodeFrom, Node nodeTo) {
-  exists(ExprNodes::CallCfgNode call, DataFlowDispatch::ParameterPosition pos |
-    argumentPositionMatch(call, nodeFrom, pos) and
-    viableParam(call, nodeTo, pos)
-  )
+  callStep(_, nodeFrom, nodeTo)
   or
   // In normal data-flow, this will be a local flow step. But for type tracking
   // we model it as a call step, in order to avoid computing a potential
   // self-cross product of all calls to a function that returns one of its parameters
   // (only to later filter that flow out using `TypeTracker::append`).
-  nodeTo =
-    DataFlowPrivate::LocalFlow::getParameterDefNode(nodeFrom
-          .(DataFlowPublic::ParameterNode)
-          .getParameter())
+  DataFlowPrivate::LocalFlow::localFlowSsaParamInput(nodeFrom, nodeTo)
 }
 
 /**
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index 5df0af6975b..c02fb9c18cb 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 6be0a65018d..8fc4095d3bb 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.0.11
+
 ## 0.0.10
 
 ### New Queries
diff --git a/ruby/ql/src/change-notes/released/0.0.11.md b/ruby/ql/src/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..eba254bd51f
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/0.0.11.md
@@ -0,0 +1 @@
+## 0.0.11
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index b740014e5ae..e679dc42092 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index b32ee154870..f987a9ffd16 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 0.0.11-dev
+version: 0.0.12-dev
 groups: 
   - ruby
   - queries
diff --git a/ruby/ql/src/queries/meta/internal/TaintMetrics.qll b/ruby/ql/src/queries/meta/internal/TaintMetrics.qll
index bfeccd53802..19e25f3a94b 100644
--- a/ruby/ql/src/queries/meta/internal/TaintMetrics.qll
+++ b/ruby/ql/src/queries/meta/internal/TaintMetrics.qll
@@ -25,7 +25,7 @@ DataFlow::Node relevantTaintSink(string kind) {
     or
     kind = "CommandInjection" and result instanceof CommandInjection::Sink
     or
-    kind = "XSS" and result instanceof ReflectedXSS::Sink
+    kind = "XSS" and result instanceof ReflectedXss::Sink
     or
     kind = "PathInjection" and result instanceof PathInjection::Sink
     or
diff --git a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
index d3f95f69fea..c66fec03340 100644
--- a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
+++ b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
@@ -18,7 +18,7 @@ import codeql.ruby.security.ReflectedXSSQuery
 import codeql.ruby.DataFlow
 import DataFlow::PathGraph
 
-from ReflectedXSS::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from ReflectedXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "a user-provided value"
diff --git a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
index e473d5c31e9..dd58b0000c9 100644
--- a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
+++ b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
@@ -17,7 +17,7 @@ import codeql.ruby.security.StoredXSSQuery
 import codeql.ruby.DataFlow
 import DataFlow::PathGraph
 
-from StoredXSS::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from StoredXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@",
   source.getNode(), "stored value"
diff --git a/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql b/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql
index dbffd00290f..c2ce3611b49 100644
--- a/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql
+++ b/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql
@@ -19,8 +19,8 @@ import codeql.ruby.dataflow.RemoteFlowSources
 import codeql.ruby.TaintTracking
 import DataFlow::PathGraph
 
-class SQLInjectionConfiguration extends TaintTracking::Configuration {
-  SQLInjectionConfiguration() { this = "SQLInjectionConfiguration" }
+class SqlInjectionConfiguration extends TaintTracking::Configuration {
+  SqlInjectionConfiguration() { this = "SQLInjectionConfiguration" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
@@ -32,7 +32,7 @@ class SQLInjectionConfiguration extends TaintTracking::Configuration {
   }
 }
 
-from SQLInjectionConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from SqlInjectionConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "This SQL query depends on $@.", source.getNode(),
   "a user-provided value"
diff --git a/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql b/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql
index 47587c7af4f..80829e2f062 100644
--- a/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql
+++ b/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql
@@ -16,6 +16,6 @@
 
 import codeql.ruby.security.BadTagFilterQuery
 
-from HTMLMatchingRegExp regexp, string msg
+from HtmlMatchingRegExp regexp, string msg
 where msg = min(string m | isBadRegexpFilter(regexp, m) | m order by m.length(), m) // there might be multiple, we arbitrarily pick the shortest one
 select regexp, msg
diff --git a/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll b/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll
index 7d605a491ee..a4d264b2703 100644
--- a/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -124,7 +124,9 @@ abstract class InlineExpectationsTest extends string {
   abstract predicate hasActualResult(Location location, string element, string tag, string value);
 
   /**
-   * Like `hasActualResult`, but returns results that do not require a matching annotation.
+   * Holds if there is an optional result on the specified location.
+   *
+   * This is similar to `hasActualResult`, but returns results that do not require a matching annotation.
    * A failure will still arise if there is an annotation that does not match any results, but not vice versa.
    * Override this predicate to specify optional results.
    */
diff --git a/ruby/ql/test/library-tests/ast/Ast.expected b/ruby/ql/test/library-tests/ast/Ast.expected
index 422af8141d5..216edb2ee0e 100644
--- a/ruby/ql/test/library-tests/ast/Ast.expected
+++ b/ruby/ql/test/library-tests/ast/Ast.expected
@@ -1,28 +1,28 @@
 gems/Gemfile:
 #    1| [Toplevel] Gemfile
 #    1|   getStmt: [MethodCall] call to source
-#    1|     getReceiver: [Self, SelfVariableAccess] self
+#    1|     getReceiver: [SelfVariableAccess] self
 #    1|     getArgument: [StringLiteral] "https://rubygems.org"
 #    1|       getComponent: [StringTextComponent] https://rubygems.org
 #    3|   getStmt: [MethodCall] call to gem
-#    3|     getReceiver: [Self, SelfVariableAccess] self
+#    3|     getReceiver: [SelfVariableAccess] self
 #    3|     getArgument: [StringLiteral] "foo_gem"
 #    3|       getComponent: [StringTextComponent] foo_gem
 #    3|     getArgument: [StringLiteral] "~> 2.0"
 #    3|       getComponent: [StringTextComponent] ~> 2.0
 #    5|   getStmt: [MethodCall] call to source
-#    5|     getReceiver: [Self, SelfVariableAccess] self
+#    5|     getReceiver: [SelfVariableAccess] self
 #    5|     getArgument: [StringLiteral] "https://gems.example.com"
 #    5|       getComponent: [StringTextComponent] https://gems.example.com
 #    5|     getBlock: [DoBlock] do ... end
 #    6|       getStmt: [MethodCall] call to gem
-#    6|         getReceiver: [Self, SelfVariableAccess] self
+#    6|         getReceiver: [SelfVariableAccess] self
 #    6|         getArgument: [StringLiteral] "my_gem"
 #    6|           getComponent: [StringTextComponent] my_gem
 #    6|         getArgument: [StringLiteral] "1.0"
 #    6|           getComponent: [StringTextComponent] 1.0
 #    7|       getStmt: [MethodCall] call to gem
-#    7|         getReceiver: [Self, SelfVariableAccess] self
+#    7|         getReceiver: [SelfVariableAccess] self
 #    7|         getArgument: [StringLiteral] "another_gem"
 #    7|           getComponent: [StringTextComponent] another_gem
 #    7|         getArgument: [StringLiteral] "3.1.4"
@@ -30,20 +30,20 @@ gems/Gemfile:
 calls/calls.rb:
 #    1| [Toplevel] calls.rb
 #    2|   getStmt: [MethodCall] call to foo
-#    2|     getReceiver: [Self, SelfVariableAccess] self
+#    2|     getReceiver: [SelfVariableAccess] self
 #    5|   getStmt: [MethodCall] call to bar
 #    5|     getReceiver: [ConstantReadAccess] Foo
 #    8|   getStmt: [MethodCall] call to bar
-#    8|     getReceiver: [Self, SelfVariableAccess] self
+#    8|     getReceiver: [SelfVariableAccess] self
 #   11|   getStmt: [MethodCall] call to bar
 #   11|     getReceiver: [IntegerLiteral] 123
 #   14|   getStmt: [MethodCall] call to foo
-#   14|     getReceiver: [Self, SelfVariableAccess] self
+#   14|     getReceiver: [SelfVariableAccess] self
 #   14|     getArgument: [IntegerLiteral] 0
 #   14|     getArgument: [IntegerLiteral] 1
 #   14|     getArgument: [IntegerLiteral] 2
 #   17|   getStmt: [MethodCall] call to foo
-#   17|     getReceiver: [Self, SelfVariableAccess] self
+#   17|     getReceiver: [SelfVariableAccess] self
 #   17|     getBlock: [BraceBlock] { ... }
 #   17|       getParameter: [SimpleParameter] x
 #   17|         getDefiningAccess: [LocalVariableAccess] x
@@ -51,7 +51,7 @@ calls/calls.rb:
 #   17|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] x
 #   17|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #   20|   getStmt: [MethodCall] call to foo
-#   20|     getReceiver: [Self, SelfVariableAccess] self
+#   20|     getReceiver: [SelfVariableAccess] self
 #   20|     getBlock: [DoBlock] do ... end
 #   20|       getParameter: [SimpleParameter] x
 #   20|         getDefiningAccess: [LocalVariableAccess] x
@@ -75,33 +75,33 @@ calls/calls.rb:
 #   36|       getArgument: [IntegerLiteral] 100
 #   36|       getArgument: [IntegerLiteral] 200
 #   46|   getStmt: [MethodCall] call to foo
-#   46|     getReceiver: [Self, SelfVariableAccess] self
+#   46|     getReceiver: [SelfVariableAccess] self
 #   47|   getStmt: [MethodCall] call to foo
 #   47|     getReceiver: [ConstantReadAccess] X
 #   50|   getStmt: [ParenthesizedExpr] ( ... )
 #   50|     getStmt: [MethodCall] call to foo
-#   50|       getReceiver: [Self, SelfVariableAccess] self
+#   50|       getReceiver: [SelfVariableAccess] self
 #   51|   getStmt: [ParenthesizedExpr] ( ... )
 #   51|     getStmt: [MethodCall] call to foo
 #   51|       getReceiver: [ConstantReadAccess] X
 #   54|   getStmt: [MethodCall] call to some_func
-#   54|     getReceiver: [Self, SelfVariableAccess] self
+#   54|     getReceiver: [SelfVariableAccess] self
 #   54|     getArgument: [MethodCall] call to foo
-#   54|       getReceiver: [Self, SelfVariableAccess] self
+#   54|       getReceiver: [SelfVariableAccess] self
 #   55|   getStmt: [MethodCall] call to some_func
-#   55|     getReceiver: [Self, SelfVariableAccess] self
+#   55|     getReceiver: [SelfVariableAccess] self
 #   55|     getArgument: [MethodCall] call to foo
 #   55|       getReceiver: [ConstantReadAccess] X
 #   58|   getStmt: [ArrayLiteral] [...]
 #   58|     getElement: [MethodCall] call to foo
-#   58|       getReceiver: [Self, SelfVariableAccess] self
+#   58|       getReceiver: [SelfVariableAccess] self
 #   59|   getStmt: [ArrayLiteral] [...]
 #   59|     getElement: [MethodCall] call to foo
 #   59|       getReceiver: [ConstantReadAccess] X
 #   62|   getStmt: [AssignExpr] ... = ...
 #   62|     getAnOperand/getLeftOperand: [LocalVariableAccess] var1
 #   62|     getAnOperand/getRightOperand: [MethodCall] call to foo
-#   62|       getReceiver: [Self, SelfVariableAccess] self
+#   62|       getReceiver: [SelfVariableAccess] self
 #   63|   getStmt: [AssignExpr] ... = ...
 #   63|     getAnOperand/getLeftOperand: [LocalVariableAccess] var1
 #   63|     getAnOperand/getRightOperand: [MethodCall] call to foo
@@ -109,7 +109,7 @@ calls/calls.rb:
 #   66|   getStmt: [AssignAddExpr] ... += ...
 #   66|     getAnOperand/getLeftOperand: [LocalVariableAccess] var1
 #   66|     getAnOperand/getRightOperand: [MethodCall] call to bar
-#   66|       getReceiver: [Self, SelfVariableAccess] self
+#   66|       getReceiver: [SelfVariableAccess] self
 #   67|   getStmt: [AssignAddExpr] ... += ...
 #   67|     getAnOperand/getLeftOperand: [LocalVariableAccess] var1
 #   67|     getAnOperand/getRightOperand: [MethodCall] call to bar
@@ -118,64 +118,64 @@ calls/calls.rb:
 #   70|     getAnOperand/getLeftOperand: [LocalVariableAccess] var1
 #   70|     getAnOperand/getRightOperand: [ArgumentList] ..., ...
 #   70|       getElement: [MethodCall] call to foo
-#   70|         getReceiver: [Self, SelfVariableAccess] self
+#   70|         getReceiver: [SelfVariableAccess] self
 #   70|       getElement: [MethodCall] call to bar
 #   70|         getReceiver: [ConstantReadAccess] X
 #   73|   getStmt: [BeginExpr] begin ... 
 #   74|     getStmt: [MethodCall] call to foo
-#   74|       getReceiver: [Self, SelfVariableAccess] self
+#   74|       getReceiver: [SelfVariableAccess] self
 #   75|     getStmt: [MethodCall] call to foo
 #   75|       getReceiver: [ConstantReadAccess] X
 #   79|   getBeginBlock: [BeginBlock] BEGIN { ... }
 #   79|     getStmt: [MethodCall] call to foo
-#   79|       getReceiver: [Self, SelfVariableAccess] self
+#   79|       getReceiver: [SelfVariableAccess] self
 #   79|     getStmt: [MethodCall] call to bar
 #   79|       getReceiver: [ConstantReadAccess] X
 #   82|   getStmt: [EndBlock] END { ... }
 #   82|     getStmt: [MethodCall] call to foo
-#   82|       getReceiver: [Self, SelfVariableAccess] self
+#   82|       getReceiver: [SelfVariableAccess] self
 #   82|     getStmt: [MethodCall] call to bar
 #   82|       getReceiver: [ConstantReadAccess] X
 #   85|   getStmt: [AddExpr] ... + ...
 #   85|     getAnOperand/getLeftOperand/getReceiver: [MethodCall] call to foo
-#   85|       getReceiver: [Self, SelfVariableAccess] self
+#   85|       getReceiver: [SelfVariableAccess] self
 #   85|     getAnOperand/getArgument/getRightOperand: [MethodCall] call to bar
 #   85|       getReceiver: [ConstantReadAccess] X
 #   88|   getStmt: [NotExpr] ! ...
 #   88|     getAnOperand/getOperand/getReceiver: [MethodCall] call to foo
-#   88|       getReceiver: [Self, SelfVariableAccess] self
+#   88|       getReceiver: [SelfVariableAccess] self
 #   89|   getStmt: [ComplementExpr] ~ ...
 #   89|     getAnOperand/getOperand/getReceiver: [MethodCall] call to bar
 #   89|       getReceiver: [ConstantReadAccess] X
 #   92|   getStmt: [MethodCall] call to foo
-#   92|     getReceiver: [Self, SelfVariableAccess] self
+#   92|     getReceiver: [SelfVariableAccess] self
 #   92|     getBlock: [BraceBlock] { ... }
 #   92|       getStmt: [MethodCall] call to bar
-#   92|         getReceiver: [Self, SelfVariableAccess] self
+#   92|         getReceiver: [SelfVariableAccess] self
 #   92|       getStmt: [MethodCall] call to baz
 #   92|         getReceiver: [ConstantReadAccess] X
 #   95|   getStmt: [MethodCall] call to foo
-#   95|     getReceiver: [Self, SelfVariableAccess] self
+#   95|     getReceiver: [SelfVariableAccess] self
 #   95|     getBlock: [DoBlock] do ... end
 #   96|       getStmt: [MethodCall] call to bar
-#   96|         getReceiver: [Self, SelfVariableAccess] self
+#   96|         getReceiver: [SelfVariableAccess] self
 #   97|       getStmt: [MethodCall] call to baz
 #   97|         getReceiver: [ConstantReadAccess] X
 #  101|   getStmt: [MethodCall] call to bar
 #  101|     getReceiver: [MethodCall] call to foo
-#  101|       getReceiver: [Self, SelfVariableAccess] self
+#  101|       getReceiver: [SelfVariableAccess] self
 #  102|   getStmt: [MethodCall] call to baz
 #  102|     getReceiver: [MethodCall] call to bar
-#  102|       getReceiver: [Self, SelfVariableAccess] self
+#  102|       getReceiver: [SelfVariableAccess] self
 #  106|   getStmt: [CaseExpr] case ...
 #  106|     getValue: [MethodCall] call to foo
-#  106|       getReceiver: [Self, SelfVariableAccess] self
+#  106|       getReceiver: [SelfVariableAccess] self
 #  107|     getBranch: [WhenClause] when ...
 #  107|       getPattern: [MethodCall] call to bar
-#  107|         getReceiver: [Self, SelfVariableAccess] self
+#  107|         getReceiver: [SelfVariableAccess] self
 #  107|       getBody: [StmtSequence] then ...
 #  108|         getStmt: [MethodCall] call to baz
-#  108|           getReceiver: [Self, SelfVariableAccess] self
+#  108|           getReceiver: [SelfVariableAccess] self
 #  110|   getStmt: [CaseExpr] case ...
 #  110|     getValue: [MethodCall] call to foo
 #  110|       getReceiver: [ConstantReadAccess] X
@@ -187,20 +187,20 @@ calls/calls.rb:
 #  112|           getReceiver: [ConstantReadAccess] X
 #  116|   getStmt: [ClassDeclaration] MyClass
 #  117|     getStmt: [MethodCall] call to foo
-#  117|       getReceiver: [Self, SelfVariableAccess] self
+#  117|       getReceiver: [SelfVariableAccess] self
 #  118|     getStmt: [MethodCall] call to bar
 #  118|       getReceiver: [ConstantReadAccess] X
 #  122|   getStmt: [ClassDeclaration] MyClass
 #  122|     getSuperclassExpr: [MethodCall] call to foo
-#  122|       getReceiver: [Self, SelfVariableAccess] self
+#  122|       getReceiver: [SelfVariableAccess] self
 #  124|   getStmt: [ClassDeclaration] MyClass2
 #  124|     getSuperclassExpr: [MethodCall] call to foo
 #  124|       getReceiver: [ConstantReadAccess] X
 #  128|   getStmt: [SingletonClass] class << ...
 #  128|     getValue: [MethodCall] call to foo
-#  128|       getReceiver: [Self, SelfVariableAccess] self
+#  128|       getReceiver: [SelfVariableAccess] self
 #  129|     getStmt: [MethodCall] call to bar
-#  129|       getReceiver: [Self, SelfVariableAccess] self
+#  129|       getReceiver: [SelfVariableAccess] self
 #  131|   getStmt: [SingletonClass] class << ...
 #  131|     getValue: [MethodCall] call to foo
 #  131|       getReceiver: [ConstantReadAccess] X
@@ -208,21 +208,21 @@ calls/calls.rb:
 #  132|       getReceiver: [ConstantReadAccess] X
 #  136|   getStmt: [Method] some_method
 #  137|     getStmt: [MethodCall] call to foo
-#  137|       getReceiver: [Self, SelfVariableAccess] self
+#  137|       getReceiver: [SelfVariableAccess] self
 #  138|     getStmt: [MethodCall] call to bar
 #  138|       getReceiver: [ConstantReadAccess] X
 #  142|   getStmt: [SingletonMethod] some_method
 #  142|     getObject: [MethodCall] call to foo
-#  142|       getReceiver: [Self, SelfVariableAccess] self
+#  142|       getReceiver: [SelfVariableAccess] self
 #  143|     getStmt: [MethodCall] call to bar
-#  143|       getReceiver: [Self, SelfVariableAccess] self
+#  143|       getReceiver: [SelfVariableAccess] self
 #  144|     getStmt: [MethodCall] call to baz
 #  144|       getReceiver: [ConstantReadAccess] X
 #  148|   getStmt: [Method] method_with_keyword_param
 #  148|     getParameter: [KeywordParameter] keyword
 #  148|       getDefiningAccess: [LocalVariableAccess] keyword
 #  148|       getDefaultValue: [MethodCall] call to foo
-#  148|         getReceiver: [Self, SelfVariableAccess] self
+#  148|         getReceiver: [SelfVariableAccess] self
 #  150|   getStmt: [Method] method_with_keyword_param2
 #  150|     getParameter: [KeywordParameter] keyword
 #  150|       getDefiningAccess: [LocalVariableAccess] keyword
@@ -232,7 +232,7 @@ calls/calls.rb:
 #  154|     getParameter: [OptionalParameter] param
 #  154|       getDefiningAccess: [LocalVariableAccess] param
 #  154|       getDefaultValue: [MethodCall] call to foo
-#  154|         getReceiver: [Self, SelfVariableAccess] self
+#  154|         getReceiver: [SelfVariableAccess] self
 #  156|   getStmt: [Method] method_with_optional_param2
 #  156|     getParameter: [OptionalParameter] param
 #  156|       getDefiningAccess: [LocalVariableAccess] param
@@ -240,16 +240,16 @@ calls/calls.rb:
 #  156|         getReceiver: [ConstantReadAccess] X
 #  160|   getStmt: [ModuleDeclaration] SomeModule
 #  161|     getStmt: [MethodCall] call to foo
-#  161|       getReceiver: [Self, SelfVariableAccess] self
+#  161|       getReceiver: [SelfVariableAccess] self
 #  162|     getStmt: [MethodCall] call to bar
 #  162|       getReceiver: [ConstantReadAccess] X
 #  166|   getStmt: [TernaryIfExpr] ... ? ... : ...
 #  166|     getCondition: [MethodCall] call to foo
-#  166|       getReceiver: [Self, SelfVariableAccess] self
+#  166|       getReceiver: [SelfVariableAccess] self
 #  166|     getBranch/getThen: [MethodCall] call to bar
-#  166|       getReceiver: [Self, SelfVariableAccess] self
+#  166|       getReceiver: [SelfVariableAccess] self
 #  166|     getBranch/getElse: [MethodCall] call to baz
-#  166|       getReceiver: [Self, SelfVariableAccess] self
+#  166|       getReceiver: [SelfVariableAccess] self
 #  167|   getStmt: [TernaryIfExpr] ... ? ... : ...
 #  167|     getCondition: [MethodCall] call to foo
 #  167|       getReceiver: [ConstantReadAccess] X
@@ -259,19 +259,19 @@ calls/calls.rb:
 #  167|       getReceiver: [ConstantReadAccess] X
 #  170|   getStmt: [IfExpr] if ...
 #  170|     getCondition: [MethodCall] call to foo
-#  170|       getReceiver: [Self, SelfVariableAccess] self
+#  170|       getReceiver: [SelfVariableAccess] self
 #  170|     getBranch/getThen: [StmtSequence] then ...
 #  171|       getStmt: [MethodCall] call to wibble
-#  171|         getReceiver: [Self, SelfVariableAccess] self
+#  171|         getReceiver: [SelfVariableAccess] self
 #  172|     getBranch/getElse: [IfExpr] elsif ...
 #  172|       getCondition: [MethodCall] call to bar
-#  172|         getReceiver: [Self, SelfVariableAccess] self
+#  172|         getReceiver: [SelfVariableAccess] self
 #  172|       getBranch/getThen: [StmtSequence] then ...
 #  173|         getStmt: [MethodCall] call to wobble
-#  173|           getReceiver: [Self, SelfVariableAccess] self
+#  173|           getReceiver: [SelfVariableAccess] self
 #  174|       getBranch/getElse: [StmtSequence] else ...
 #  175|         getStmt: [MethodCall] call to wabble
-#  175|           getReceiver: [Self, SelfVariableAccess] self
+#  175|           getReceiver: [SelfVariableAccess] self
 #  177|   getStmt: [IfExpr] if ...
 #  177|     getCondition: [MethodCall] call to foo
 #  177|       getReceiver: [ConstantReadAccess] X
@@ -289,9 +289,9 @@ calls/calls.rb:
 #  182|           getReceiver: [ConstantReadAccess] X
 #  186|   getStmt: [IfModifierExpr] ... if ...
 #  186|     getBody/getBranch: [MethodCall] call to bar
-#  186|       getReceiver: [Self, SelfVariableAccess] self
+#  186|       getReceiver: [SelfVariableAccess] self
 #  186|     getCondition: [MethodCall] call to foo
-#  186|       getReceiver: [Self, SelfVariableAccess] self
+#  186|       getReceiver: [SelfVariableAccess] self
 #  187|   getStmt: [IfModifierExpr] ... if ...
 #  187|     getBody/getBranch: [MethodCall] call to bar
 #  187|       getReceiver: [ConstantReadAccess] X
@@ -299,10 +299,10 @@ calls/calls.rb:
 #  187|       getReceiver: [ConstantReadAccess] X
 #  190|   getStmt: [UnlessExpr] unless ...
 #  190|     getCondition: [MethodCall] call to foo
-#  190|       getReceiver: [Self, SelfVariableAccess] self
+#  190|       getReceiver: [SelfVariableAccess] self
 #  190|     getBranch/getThen: [StmtSequence] then ...
 #  191|       getStmt: [MethodCall] call to bar
-#  191|         getReceiver: [Self, SelfVariableAccess] self
+#  191|         getReceiver: [SelfVariableAccess] self
 #  193|   getStmt: [UnlessExpr] unless ...
 #  193|     getCondition: [MethodCall] call to foo
 #  193|       getReceiver: [ConstantReadAccess] X
@@ -311,9 +311,9 @@ calls/calls.rb:
 #  194|         getReceiver: [ConstantReadAccess] X
 #  198|   getStmt: [UnlessModifierExpr] ... unless ...
 #  198|     getBody/getBranch: [MethodCall] call to bar
-#  198|       getReceiver: [Self, SelfVariableAccess] self
+#  198|       getReceiver: [SelfVariableAccess] self
 #  198|     getCondition: [MethodCall] call to foo
-#  198|       getReceiver: [Self, SelfVariableAccess] self
+#  198|       getReceiver: [SelfVariableAccess] self
 #  199|   getStmt: [UnlessModifierExpr] ... unless ...
 #  199|     getBody/getBranch: [MethodCall] call to bar
 #  199|       getReceiver: [ConstantReadAccess] X
@@ -321,10 +321,10 @@ calls/calls.rb:
 #  199|       getReceiver: [ConstantReadAccess] X
 #  202|   getStmt: [WhileExpr] while ...
 #  202|     getCondition: [MethodCall] call to foo
-#  202|       getReceiver: [Self, SelfVariableAccess] self
+#  202|       getReceiver: [SelfVariableAccess] self
 #  202|     getBody: [StmtSequence] do ...
 #  203|       getStmt: [MethodCall] call to bar
-#  203|         getReceiver: [Self, SelfVariableAccess] self
+#  203|         getReceiver: [SelfVariableAccess] self
 #  205|   getStmt: [WhileExpr] while ...
 #  205|     getCondition: [MethodCall] call to foo
 #  205|       getReceiver: [ConstantReadAccess] X
@@ -333,9 +333,9 @@ calls/calls.rb:
 #  206|         getReceiver: [ConstantReadAccess] X
 #  210|   getStmt: [WhileModifierExpr] ... while ...
 #  210|     getBody: [MethodCall] call to bar
-#  210|       getReceiver: [Self, SelfVariableAccess] self
+#  210|       getReceiver: [SelfVariableAccess] self
 #  210|     getCondition: [MethodCall] call to foo
-#  210|       getReceiver: [Self, SelfVariableAccess] self
+#  210|       getReceiver: [SelfVariableAccess] self
 #  211|   getStmt: [WhileModifierExpr] ... while ...
 #  211|     getBody: [MethodCall] call to bar
 #  211|       getReceiver: [ConstantReadAccess] X
@@ -343,10 +343,10 @@ calls/calls.rb:
 #  211|       getReceiver: [ConstantReadAccess] X
 #  214|   getStmt: [UntilExpr] until ...
 #  214|     getCondition: [MethodCall] call to foo
-#  214|       getReceiver: [Self, SelfVariableAccess] self
+#  214|       getReceiver: [SelfVariableAccess] self
 #  214|     getBody: [StmtSequence] do ...
 #  215|       getStmt: [MethodCall] call to bar
-#  215|         getReceiver: [Self, SelfVariableAccess] self
+#  215|         getReceiver: [SelfVariableAccess] self
 #  217|   getStmt: [UntilExpr] until ...
 #  217|     getCondition: [MethodCall] call to foo
 #  217|       getReceiver: [ConstantReadAccess] X
@@ -355,9 +355,9 @@ calls/calls.rb:
 #  218|         getReceiver: [ConstantReadAccess] X
 #  222|   getStmt: [UntilModifierExpr] ... until ...
 #  222|     getBody: [MethodCall] call to bar
-#  222|       getReceiver: [Self, SelfVariableAccess] self
+#  222|       getReceiver: [SelfVariableAccess] self
 #  222|     getCondition: [MethodCall] call to foo
-#  222|       getReceiver: [Self, SelfVariableAccess] self
+#  222|       getReceiver: [SelfVariableAccess] self
 #  223|   getStmt: [UntilModifierExpr] ... until ...
 #  223|     getBody: [MethodCall] call to bar
 #  223|       getReceiver: [ConstantReadAccess] X
@@ -366,10 +366,10 @@ calls/calls.rb:
 #  226|   getStmt: [ForExpr] for ... in ...
 #  226|     getPattern: [LocalVariableAccess] x
 #  226|     getValue: [MethodCall] call to bar
-#  226|       getReceiver: [Self, SelfVariableAccess] self
+#  226|       getReceiver: [SelfVariableAccess] self
 #  226|     getBody: [StmtSequence] do ...
 #  227|       getStmt: [MethodCall] call to baz
-#  227|         getReceiver: [Self, SelfVariableAccess] self
+#  227|         getReceiver: [SelfVariableAccess] self
 #  229|   getStmt: [ForExpr] for ... in ...
 #  229|     getPattern: [LocalVariableAccess] x
 #  229|     getValue: [MethodCall] call to bar
@@ -379,9 +379,9 @@ calls/calls.rb:
 #  230|         getReceiver: [ConstantReadAccess] X
 #  234|   getStmt: [ElementReference] ...[...]
 #  234|     getReceiver: [MethodCall] call to foo
-#  234|       getReceiver: [Self, SelfVariableAccess] self
+#  234|       getReceiver: [SelfVariableAccess] self
 #  234|     getArgument: [MethodCall] call to bar
-#  234|       getReceiver: [Self, SelfVariableAccess] self
+#  234|       getReceiver: [SelfVariableAccess] self
 #  235|   getStmt: [ElementReference] ...[...]
 #  235|     getReceiver: [MethodCall] call to foo
 #  235|       getReceiver: [ConstantReadAccess] X
@@ -391,22 +391,22 @@ calls/calls.rb:
 #  238|     getComponent: [StringTextComponent] foo-
 #  238|     getComponent: [StringInterpolationComponent] #{...}
 #  238|       getStmt: [MethodCall] call to bar
-#  238|         getReceiver: [Self, SelfVariableAccess] self
+#  238|         getReceiver: [SelfVariableAccess] self
 #  238|     getComponent: [StringTextComponent] -
 #  238|     getComponent: [StringInterpolationComponent] #{...}
 #  238|       getStmt: [MethodCall] call to baz
 #  238|         getReceiver: [ConstantReadAccess] X
 #  241|   getStmt: [ConstantReadAccess] Bar
 #  241|     getScopeExpr: [MethodCall] call to foo
-#  241|       getReceiver: [Self, SelfVariableAccess] self
+#  241|       getReceiver: [SelfVariableAccess] self
 #  242|   getStmt: [ConstantReadAccess] Bar
 #  242|     getScopeExpr: [MethodCall] call to foo
 #  242|       getReceiver: [ConstantReadAccess] X
 #  245|   getStmt: [RangeLiteral] _ .. _
 #  245|     getBegin: [MethodCall] call to foo
-#  245|       getReceiver: [Self, SelfVariableAccess] self
+#  245|       getReceiver: [SelfVariableAccess] self
 #  245|     getEnd: [MethodCall] call to bar
-#  245|       getReceiver: [Self, SelfVariableAccess] self
+#  245|       getReceiver: [SelfVariableAccess] self
 #  246|   getStmt: [RangeLiteral] _ .. _
 #  246|     getBegin: [MethodCall] call to foo
 #  246|       getReceiver: [ConstantReadAccess] X
@@ -415,9 +415,9 @@ calls/calls.rb:
 #  249|   getStmt: [HashLiteral] {...}
 #  249|     getElement: [Pair] Pair
 #  249|       getKey: [MethodCall] call to foo
-#  249|         getReceiver: [Self, SelfVariableAccess] self
+#  249|         getReceiver: [SelfVariableAccess] self
 #  249|       getValue: [MethodCall] call to bar
-#  249|         getReceiver: [Self, SelfVariableAccess] self
+#  249|         getReceiver: [SelfVariableAccess] self
 #  249|     getElement: [Pair] Pair
 #  249|       getKey: [MethodCall] call to foo
 #  249|         getReceiver: [ConstantReadAccess] X
@@ -426,10 +426,10 @@ calls/calls.rb:
 #  252|   getStmt: [BeginExpr] begin ... 
 #  253|     getRescue: [RescueClause] rescue ...
 #  253|       getException: [MethodCall] call to foo
-#  253|         getReceiver: [Self, SelfVariableAccess] self
+#  253|         getReceiver: [SelfVariableAccess] self
 #  254|     getEnsure: [StmtSequence] ensure ...
 #  254|       getStmt: [MethodCall] call to bar
-#  254|         getReceiver: [Self, SelfVariableAccess] self
+#  254|         getReceiver: [SelfVariableAccess] self
 #  256|   getStmt: [BeginExpr] begin ... 
 #  257|     getRescue: [RescueClause] rescue ...
 #  257|       getException: [MethodCall] call to foo
@@ -439,55 +439,55 @@ calls/calls.rb:
 #  258|         getReceiver: [ConstantReadAccess] X
 #  262|   getStmt: [RescueModifierExpr] ... rescue ...
 #  262|     getBody: [MethodCall] call to foo
-#  262|       getReceiver: [Self, SelfVariableAccess] self
+#  262|       getReceiver: [SelfVariableAccess] self
 #  262|     getHandler: [MethodCall] call to bar
-#  262|       getReceiver: [Self, SelfVariableAccess] self
+#  262|       getReceiver: [SelfVariableAccess] self
 #  263|   getStmt: [RescueModifierExpr] ... rescue ...
 #  263|     getBody: [MethodCall] call to foo
 #  263|       getReceiver: [ConstantReadAccess] X
 #  263|     getHandler: [MethodCall] call to bar
 #  263|       getReceiver: [ConstantReadAccess] X
 #  266|   getStmt: [MethodCall] call to foo
-#  266|     getReceiver: [Self, SelfVariableAccess] self
+#  266|     getReceiver: [SelfVariableAccess] self
 #  266|     getArgument: [BlockArgument] &...
 #  266|       getValue: [MethodCall] call to bar
-#  266|         getReceiver: [Self, SelfVariableAccess] self
+#  266|         getReceiver: [SelfVariableAccess] self
 #  267|   getStmt: [MethodCall] call to foo
-#  267|     getReceiver: [Self, SelfVariableAccess] self
+#  267|     getReceiver: [SelfVariableAccess] self
 #  267|     getArgument: [BlockArgument] &...
 #  267|       getValue: [MethodCall] call to bar
 #  267|         getReceiver: [ConstantReadAccess] X
 #  268|   getStmt: [MethodCall] call to foo
-#  268|     getReceiver: [Self, SelfVariableAccess] self
+#  268|     getReceiver: [SelfVariableAccess] self
 #  268|     getArgument: [BlockArgument] &...
 #  270|   getStmt: [MethodCall] call to foo
-#  270|     getReceiver: [Self, SelfVariableAccess] self
+#  270|     getReceiver: [SelfVariableAccess] self
 #  270|     getArgument: [SplatExpr] * ...
 #  270|       getAnOperand/getOperand/getReceiver: [MethodCall] call to bar
-#  270|         getReceiver: [Self, SelfVariableAccess] self
+#  270|         getReceiver: [SelfVariableAccess] self
 #  271|   getStmt: [MethodCall] call to foo
-#  271|     getReceiver: [Self, SelfVariableAccess] self
+#  271|     getReceiver: [SelfVariableAccess] self
 #  271|     getArgument: [SplatExpr] * ...
 #  271|       getAnOperand/getOperand/getReceiver: [MethodCall] call to bar
 #  271|         getReceiver: [ConstantReadAccess] X
 #  274|   getStmt: [MethodCall] call to foo
-#  274|     getReceiver: [Self, SelfVariableAccess] self
+#  274|     getReceiver: [SelfVariableAccess] self
 #  274|     getArgument: [HashSplatExpr] ** ...
 #  274|       getAnOperand/getOperand/getReceiver: [MethodCall] call to bar
-#  274|         getReceiver: [Self, SelfVariableAccess] self
+#  274|         getReceiver: [SelfVariableAccess] self
 #  275|   getStmt: [MethodCall] call to foo
-#  275|     getReceiver: [Self, SelfVariableAccess] self
+#  275|     getReceiver: [SelfVariableAccess] self
 #  275|     getArgument: [HashSplatExpr] ** ...
 #  275|       getAnOperand/getOperand/getReceiver: [MethodCall] call to bar
 #  275|         getReceiver: [ConstantReadAccess] X
 #  278|   getStmt: [MethodCall] call to foo
-#  278|     getReceiver: [Self, SelfVariableAccess] self
+#  278|     getReceiver: [SelfVariableAccess] self
 #  278|     getArgument: [Pair] Pair
 #  278|       getKey: [SymbolLiteral] :blah
 #  278|       getValue: [MethodCall] call to bar
-#  278|         getReceiver: [Self, SelfVariableAccess] self
+#  278|         getReceiver: [SelfVariableAccess] self
 #  279|   getStmt: [MethodCall] call to foo
-#  279|     getReceiver: [Self, SelfVariableAccess] self
+#  279|     getReceiver: [SelfVariableAccess] self
 #  279|     getArgument: [Pair] Pair
 #  279|       getKey: [SymbolLiteral] :blah
 #  279|       getValue: [MethodCall] call to bar
@@ -539,37 +539,37 @@ calls/calls.rb:
 #  302|     getStmt: [Method] another_method
 #  303|       getStmt: [MethodCall] call to super
 #  303|         getReceiver: [MethodCall] call to foo
-#  303|           getReceiver: [Self, SelfVariableAccess] self
+#  303|           getReceiver: [SelfVariableAccess] self
 #  304|       getStmt: [MethodCall] call to super
-#  304|         getReceiver: [Self, SelfVariableAccess] self
+#  304|         getReceiver: [SelfVariableAccess] self
 #  305|       getStmt: [MethodCall] call to super
 #  305|         getReceiver: [SuperCall] call to super
 #  310|   getStmt: [MethodCall] call to call
 #  310|     getReceiver: [MethodCall] call to foo
-#  310|       getReceiver: [Self, SelfVariableAccess] self
+#  310|       getReceiver: [SelfVariableAccess] self
 #  311|   getStmt: [MethodCall] call to call
 #  311|     getReceiver: [MethodCall] call to foo
-#  311|       getReceiver: [Self, SelfVariableAccess] self
+#  311|       getReceiver: [SelfVariableAccess] self
 #  311|     getArgument: [IntegerLiteral] 1
 #  314|   getStmt: [AssignExpr] ... = ...
 #  314|     getAnOperand/getLeftOperand: [MethodCall] call to foo
-#  314|       getReceiver: [Self, SelfVariableAccess] self
+#  314|       getReceiver: [SelfVariableAccess] self
 #  314|     getAnOperand/getRightOperand: [IntegerLiteral] 10
 #  315|   getStmt: [AssignExpr] ... = ...
 #  315|     getAnOperand/getLeftOperand: [ElementReference] ...[...]
 #  315|       getReceiver: [MethodCall] call to foo
-#  315|         getReceiver: [Self, SelfVariableAccess] self
+#  315|         getReceiver: [SelfVariableAccess] self
 #  315|       getArgument: [IntegerLiteral] 0
 #  315|     getAnOperand/getRightOperand: [IntegerLiteral] 10
 #  316|   getStmt: [AssignExpr] ... = ...
 #  316|     getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #  316|       getElement: [MethodCall] call to foo
-#  316|         getReceiver: [Self, SelfVariableAccess] self
+#  316|         getReceiver: [SelfVariableAccess] self
 #  316|       getElement: [MethodCall] call to bar
-#  316|         getReceiver: [Self, SelfVariableAccess] self
+#  316|         getReceiver: [SelfVariableAccess] self
 #  316|       getElement: [ElementReference] ...[...]
 #  316|         getReceiver: [MethodCall] call to foo
-#  316|           getReceiver: [Self, SelfVariableAccess] self
+#  316|           getReceiver: [SelfVariableAccess] self
 #  316|         getArgument: [IntegerLiteral] 4
 #  316|     getAnOperand/getRightOperand: [ArrayLiteral] [...]
 #  316|       getElement: [IntegerLiteral] 1
@@ -581,7 +581,7 @@ calls/calls.rb:
 #  317|       getElement: [LocalVariableAccess] a
 #  317|       getElement: [ElementReference] ...[...]
 #  317|         getReceiver: [MethodCall] call to foo
-#  317|           getReceiver: [Self, SelfVariableAccess] self
+#  317|           getReceiver: [SelfVariableAccess] self
 #  317|         getArgument: [IntegerLiteral] 5
 #  317|     getAnOperand/getRightOperand: [ArrayLiteral] [...]
 #  317|       getElement: [IntegerLiteral] 1
@@ -589,57 +589,57 @@ calls/calls.rb:
 #  317|       getElement: [IntegerLiteral] 3
 #  318|   getStmt: [AssignAddExpr] ... += ...
 #  318|     getAnOperand/getLeftOperand: [MethodCall] call to count
-#  318|       getReceiver: [Self, SelfVariableAccess] self
+#  318|       getReceiver: [SelfVariableAccess] self
 #  318|     getAnOperand/getRightOperand: [IntegerLiteral] 1
 #  319|   getStmt: [AssignAddExpr] ... += ...
 #  319|     getAnOperand/getLeftOperand: [ElementReference] ...[...]
 #  319|       getReceiver: [MethodCall] call to foo
-#  319|         getReceiver: [Self, SelfVariableAccess] self
+#  319|         getReceiver: [SelfVariableAccess] self
 #  319|       getArgument: [IntegerLiteral] 0
 #  319|     getAnOperand/getRightOperand: [IntegerLiteral] 1
 #  320|   getStmt: [AssignMulExpr] ... *= ...
 #  320|     getAnOperand/getLeftOperand: [ElementReference] ...[...]
 #  320|       getReceiver: [MethodCall] call to bar
 #  320|         getReceiver: [MethodCall] call to foo
-#  320|           getReceiver: [Self, SelfVariableAccess] self
+#  320|           getReceiver: [SelfVariableAccess] self
 #  320|       getArgument: [IntegerLiteral] 0
 #  320|       getArgument: [MethodCall] call to baz
 #  320|         getReceiver: [MethodCall] call to foo
-#  320|           getReceiver: [Self, SelfVariableAccess] self
+#  320|           getReceiver: [SelfVariableAccess] self
 #  320|       getArgument: [AddExpr] ... + ...
 #  320|         getAnOperand/getLeftOperand/getReceiver: [MethodCall] call to boo
 #  320|           getReceiver: [MethodCall] call to foo
-#  320|             getReceiver: [Self, SelfVariableAccess] self
+#  320|             getReceiver: [SelfVariableAccess] self
 #  320|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #  320|     getAnOperand/getRightOperand: [IntegerLiteral] 2
 #  323|   getStmt: [Method] foo
 #  323|     getStmt: [MethodCall] call to bar
-#  323|       getReceiver: [Self, SelfVariableAccess] self
+#  323|       getReceiver: [SelfVariableAccess] self
 #  324|   getStmt: [Method] foo
 #  324|     getStmt: [MethodCall] call to bar
-#  324|       getReceiver: [Self, SelfVariableAccess] self
+#  324|       getReceiver: [SelfVariableAccess] self
 #  325|   getStmt: [Method] foo
 #  325|     getParameter: [SimpleParameter] x
 #  325|       getDefiningAccess: [LocalVariableAccess] x
 #  325|     getStmt: [MethodCall] call to bar
-#  325|       getReceiver: [Self, SelfVariableAccess] self
+#  325|       getReceiver: [SelfVariableAccess] self
 #  326|   getStmt: [SingletonMethod] foo
 #  326|     getObject: [ConstantReadAccess] Object
 #  326|     getStmt: [MethodCall] call to bar
-#  326|       getReceiver: [Self, SelfVariableAccess] self
+#  326|       getReceiver: [SelfVariableAccess] self
 #  327|   getStmt: [SingletonMethod] foo
 #  327|     getObject: [ConstantReadAccess] Object
 #  327|     getParameter: [SimpleParameter] x
 #  327|       getDefiningAccess: [LocalVariableAccess] x
 #  327|     getStmt: [MethodCall] call to bar
-#  327|       getReceiver: [Self, SelfVariableAccess] self
+#  327|       getReceiver: [SelfVariableAccess] self
 #  328|   getStmt: [Method] foo
 #  328|     getStmt: [RescueModifierExpr] ... rescue ...
 #  328|       getBody: [MethodCall] call to bar
-#  328|         getReceiver: [Self, SelfVariableAccess] self
+#  328|         getReceiver: [SelfVariableAccess] self
 #  328|       getHandler: [ParenthesizedExpr] ( ... )
 #  328|         getStmt: [MethodCall] call to print
-#  328|           getReceiver: [Self, SelfVariableAccess] self
+#  328|           getReceiver: [SelfVariableAccess] self
 #  328|           getArgument: [StringLiteral] "error"
 #  328|             getComponent: [StringTextComponent] error
 #  331|   getStmt: [Method] foo
@@ -653,7 +653,7 @@ calls/calls.rb:
 #  335|       getDefiningAccess: [LocalVariableAccess] b
 #  335|     getParameter: [ForwardParameter] ...
 #  336|     getStmt: [MethodCall] call to bar
-#  336|       getReceiver: [Self, SelfVariableAccess] self
+#  336|       getReceiver: [SelfVariableAccess] self
 #  336|       getArgument: [LocalVariableAccess] b
 #  336|       getArgument: [ForwardedArguments] ...
 #  340|   getStmt: [ForExpr] for ... in ...
@@ -672,17 +672,17 @@ calls/calls.rb:
 #  340|         getElement: [IntegerLiteral] 6
 #  340|     getBody: [StmtSequence] do ...
 #  341|       getStmt: [MethodCall] call to foo
-#  341|         getReceiver: [Self, SelfVariableAccess] self
+#  341|         getReceiver: [SelfVariableAccess] self
 #  341|         getArgument: [LocalVariableAccess] x
 #  341|         getArgument: [LocalVariableAccess] y
 #  341|         getArgument: [LocalVariableAccess] z
 #  344|   getStmt: [MethodCall] call to foo
-#  344|     getReceiver: [Self, SelfVariableAccess] self
+#  344|     getReceiver: [SelfVariableAccess] self
 #  344|     getArgument: [Pair] Pair
 #  344|       getKey: [SymbolLiteral] :x
 #  344|       getValue: [IntegerLiteral] 42
 #  345|   getStmt: [MethodCall] call to foo
-#  345|     getReceiver: [Self, SelfVariableAccess] self
+#  345|     getReceiver: [SelfVariableAccess] self
 #  345|     getArgument: [Pair] Pair
 #  345|       getKey: [SymbolLiteral] :x
 #  345|       getValue: [LocalVariableAccess] x
@@ -690,12 +690,12 @@ calls/calls.rb:
 #  345|       getKey: [SymbolLiteral] :novar
 #  345|       getValue: [MethodCall] call to novar
 #  346|   getStmt: [MethodCall] call to foo
-#  346|     getReceiver: [Self, SelfVariableAccess] self
+#  346|     getReceiver: [SelfVariableAccess] self
 #  346|     getArgument: [Pair] Pair
 #  346|       getKey: [SymbolLiteral] :X
 #  346|       getValue: [IntegerLiteral] 42
 #  347|   getStmt: [MethodCall] call to foo
-#  347|     getReceiver: [Self, SelfVariableAccess] self
+#  347|     getReceiver: [SelfVariableAccess] self
 #  347|     getArgument: [Pair] Pair
 #  347|       getKey: [SymbolLiteral] :X
 #  347|       getValue: [ConstantReadAccess] X
@@ -747,7 +747,7 @@ control/cases.rb:
 #   21|         getStmt: [IntegerLiteral] 30
 #   26|   getStmt: [CaseExpr] case ...
 #   26|     getValue: [MethodCall] call to expr
-#   26|       getReceiver: [Self, SelfVariableAccess] self
+#   26|       getReceiver: [SelfVariableAccess] self
 #   27|     getBranch: [InClause] in ... then ...
 #   27|       getPattern: [IntegerLiteral] 5
 #   27|       getBody: [StmtSequence] then ...
@@ -756,7 +756,7 @@ control/cases.rb:
 #   28|       getStmt: [BooleanLiteral] false
 #   31|   getStmt: [CaseExpr] case ...
 #   31|     getValue: [MethodCall] call to expr
-#   31|       getReceiver: [Self, SelfVariableAccess] self
+#   31|       getReceiver: [SelfVariableAccess] self
 #   32|     getBranch: [InClause] in ... then ...
 #   32|       getPattern: [LocalVariableAccess] x
 #   32|       getCondition: [LTExpr] ... < ...
@@ -775,7 +775,7 @@ control/cases.rb:
 #   36|       getStmt: [BooleanLiteral] false
 #   39|   getStmt: [CaseExpr] case ...
 #   39|     getValue: [MethodCall] call to expr
-#   39|       getReceiver: [Self, SelfVariableAccess] self
+#   39|       getReceiver: [SelfVariableAccess] self
 #   40|     getBranch: [InClause] in ... then ...
 #   40|       getPattern: [IntegerLiteral] 5
 #   41|     getBranch: [InClause] in ... then ...
@@ -947,7 +947,7 @@ control/cases.rb:
 #   84|     getAnOperand/getRightOperand: [IntegerLiteral] 42
 #   86|   getStmt: [CaseExpr] case ...
 #   86|     getValue: [MethodCall] call to expr
-#   86|       getReceiver: [Self, SelfVariableAccess] self
+#   86|       getReceiver: [SelfVariableAccess] self
 #   87|     getBranch: [InClause] in ... then ...
 #   87|       getPattern: [IntegerLiteral] 5
 #   88|     getBranch: [InClause] in ... then ...
@@ -1004,7 +1004,7 @@ control/cases.rb:
 #  100|     getBranch: [InClause] in ... then ...
 #  100|       getPattern: [AlternativePattern] ... | ...
 #  100|         getAlternative: [NilLiteral] nil
-#  100|         getAlternative: [Self, SelfVariableAccess] self
+#  100|         getAlternative: [SelfVariableAccess] self
 #  100|         getAlternative: [BooleanLiteral] true
 #  100|         getAlternative: [BooleanLiteral] false
 #  100|         getAlternative: [LineLiteral] __LINE__
@@ -1043,7 +1043,7 @@ control/cases.rb:
 #  107|       getPattern: [LocalVariableAccess] var
 #  110|   getStmt: [CaseExpr] case ...
 #  110|     getValue: [MethodCall] call to expr
-#  110|       getReceiver: [Self, SelfVariableAccess] self
+#  110|       getReceiver: [SelfVariableAccess] self
 #  111|     getBranch: [InClause] in ... then ...
 #  111|       getPattern: [AlternativePattern] ... | ...
 #  111|         getAlternative: [IntegerLiteral] 5
@@ -1054,7 +1054,7 @@ control/cases.rb:
 #  111|         getAlternative: [LocalVariableAccess] var
 #  116|   getStmt: [CaseExpr] case ...
 #  116|     getValue: [MethodCall] call to expr
-#  116|       getReceiver: [Self, SelfVariableAccess] self
+#  116|       getReceiver: [SelfVariableAccess] self
 #  117|     getBranch: [InClause] in ... then ...
 #  117|       getPattern: [ArrayPattern] [ ..., * ]
 #  118|     getBranch: [InClause] in ... then ...
@@ -1083,7 +1083,7 @@ control/cases.rb:
 #  123|         getSuffixElement: [LocalVariableAccess] e
 #  128|   getStmt: [CaseExpr] case ...
 #  128|     getValue: [MethodCall] call to expr
-#  128|       getReceiver: [Self, SelfVariableAccess] self
+#  128|       getReceiver: [SelfVariableAccess] self
 #  129|     getBranch: [InClause] in ... then ...
 #  129|       getPattern: [FindPattern] [ *,...,* ]
 #  129|         getElement: [LocalVariableAccess] x
@@ -1104,7 +1104,7 @@ control/cases.rb:
 #  132|         getElement: [ConstantReadAccess] Bar
 #  137|   getStmt: [CaseExpr] case ...
 #  137|     getValue: [MethodCall] call to expr
-#  137|       getReceiver: [Self, SelfVariableAccess] self
+#  137|       getReceiver: [SelfVariableAccess] self
 #  138|     getBranch: [InClause] in ... then ...
 #  138|       getPattern: [HashPattern] { ..., ** }
 #  139|     getBranch: [InClause] in ... then ...
@@ -1141,7 +1141,7 @@ control/cases.rb:
 #  144|         getValue: [IntegerLiteral] 1
 #  147|   getStmt: [CaseExpr] case ...
 #  147|     getValue: [MethodCall] call to expr
-#  147|       getReceiver: [Self, SelfVariableAccess] self
+#  147|       getReceiver: [SelfVariableAccess] self
 #  148|     getBranch: [InClause] in ... then ...
 #  148|       getPattern: [ReferencePattern] ^...
 #  148|         getExpr: [LocalVariableAccess] foo
@@ -1156,7 +1156,7 @@ control/cases.rb:
 #  151|         getExpr: [ClassVariableAccess] @@foo
 #  154|   getStmt: [CaseExpr] case ...
 #  154|     getValue: [MethodCall] call to expr
-#  154|       getReceiver: [Self, SelfVariableAccess] self
+#  154|       getReceiver: [SelfVariableAccess] self
 #  155|     getBranch: [InClause] in ... then ...
 #  155|       getPattern: [ReferencePattern] ^...
 #  155|         getExpr: [LocalVariableAccess] foo
@@ -1175,7 +1175,7 @@ modules/classes.rb:
 #    7|     getSuperclassExpr: [ConstantReadAccess] BaseClass
 #   11|   getStmt: [ClassDeclaration] Baz
 #   11|     getSuperclassExpr: [MethodCall] call to superclass_for
-#   11|       getReceiver: [Self, SelfVariableAccess] self
+#   11|       getReceiver: [SelfVariableAccess] self
 #   11|       getArgument: [SymbolLiteral] :baz
 #   15|   getStmt: [ModuleDeclaration] MyModule
 #   16|   getStmt: [ClassDeclaration] MyClass
@@ -1183,16 +1183,16 @@ modules/classes.rb:
 #   20|   getStmt: [ClassDeclaration] Wibble
 #   21|     getStmt: [Method] method_a
 #   22|       getStmt: [MethodCall] call to puts
-#   22|         getReceiver: [Self, SelfVariableAccess] self
+#   22|         getReceiver: [SelfVariableAccess] self
 #   22|         getArgument: [StringLiteral] "a"
 #   22|           getComponent: [StringTextComponent] a
 #   25|     getStmt: [Method] method_b
 #   26|       getStmt: [MethodCall] call to puts
-#   26|         getReceiver: [Self, SelfVariableAccess] self
+#   26|         getReceiver: [SelfVariableAccess] self
 #   26|         getArgument: [StringLiteral] "b"
 #   26|           getComponent: [StringTextComponent] b
 #   29|     getStmt: [MethodCall] call to some_method_call
-#   29|       getReceiver: [Self, SelfVariableAccess] self
+#   29|       getReceiver: [SelfVariableAccess] self
 #   30|     getStmt: [AssignExpr] ... = ...
 #   30|       getAnOperand/getLeftOperand: [GlobalVariableAccess] $global_var
 #   30|       getAnOperand/getRightOperand: [IntegerLiteral] 123
@@ -1210,11 +1210,11 @@ modules/classes.rb:
 #   43|         getAnOperand/getArgument/getRightOperand: [SuperCall] call to super
 #   46|     getStmt: [Method] wibble
 #   47|       getStmt: [MethodCall] call to puts
-#   47|         getReceiver: [Self, SelfVariableAccess] self
+#   47|         getReceiver: [SelfVariableAccess] self
 #   47|         getArgument: [StringLiteral] "wibble"
 #   47|           getComponent: [StringTextComponent] wibble
 #   50|     getStmt: [MethodCall] call to another_method_call
-#   50|       getReceiver: [Self, SelfVariableAccess] self
+#   50|       getReceiver: [SelfVariableAccess] self
 #   51|     getStmt: [AssignExpr] ... = ...
 #   51|       getAnOperand/getLeftOperand: [GlobalVariableAccess] $global_var2
 #   51|       getAnOperand/getRightOperand: [IntegerLiteral] 456
@@ -1385,7 +1385,7 @@ constants/constants.rb:
 #   22|         getParameter: [SimpleParameter] name
 #   22|           getDefiningAccess: [LocalVariableAccess] name
 #   23|         getStmt: [MethodCall] call to puts
-#   23|           getReceiver: [Self, SelfVariableAccess] self
+#   23|           getReceiver: [SelfVariableAccess] self
 #   23|           getArgument: [StringLiteral] "#{...} #{...}"
 #   23|             getComponent: [StringInterpolationComponent] #{...}
 #   23|               getStmt: [ConstantReadAccess] GREETING
@@ -1393,7 +1393,7 @@ constants/constants.rb:
 #   23|             getComponent: [StringInterpolationComponent] #{...}
 #   23|               getStmt: [LocalVariableAccess] name
 #   28|     getStmt: [MethodCall] call to Array
-#   28|       getReceiver: [Self, SelfVariableAccess] self
+#   28|       getReceiver: [SelfVariableAccess] self
 #   28|       getArgument: [StringLiteral] "foo"
 #   28|         getComponent: [StringTextComponent] foo
 #   31|   getStmt: [ClassDeclaration] ClassD
@@ -1414,15 +1414,15 @@ constants/constants.rb:
 #   39|         getScopeExpr: [ConstantReadAccess] ModuleA
 #   39|     getAnOperand/getRightOperand: [IntegerLiteral] 1024
 #   41|   getStmt: [MethodCall] call to puts
-#   41|     getReceiver: [Self, SelfVariableAccess] self
+#   41|     getReceiver: [SelfVariableAccess] self
 #   41|     getArgument: [ConstantReadAccess] MAX_SIZE
 #   41|       getScopeExpr: [ConstantReadAccess] ModuleB
 #   41|         getScopeExpr: [ConstantReadAccess] ModuleA
 #   43|   getStmt: [MethodCall] call to puts
-#   43|     getReceiver: [Self, SelfVariableAccess] self
+#   43|     getReceiver: [SelfVariableAccess] self
 #   43|     getArgument: [ConstantReadAccess] GREETING
 #   44|   getStmt: [MethodCall] call to puts
-#   44|     getReceiver: [Self, SelfVariableAccess] self
+#   44|     getReceiver: [SelfVariableAccess] self
 #   44|     getArgument: [ConstantReadAccess] GREETING
 #   46|   getStmt: [ModuleDeclaration] ModuleB
 #   46|     getScopeExpr: [ConstantReadAccess] ModuleA
@@ -1459,7 +1459,7 @@ constants/constants.rb:
 #   65|         getScopeExpr: [ConstantReadAccess] Mod3
 #   68|   getStmt: [ModuleDeclaration] Mod4
 #   69|     getStmt: [MethodCall] call to include
-#   69|       getReceiver: [Self, SelfVariableAccess] self
+#   69|       getReceiver: [SelfVariableAccess] self
 #   69|       getArgument: [ConstantReadAccess] Mod1
 #   70|     getStmt: [ModuleDeclaration] Mod5
 #   70|       getScopeExpr: [ConstantReadAccess] Mod3
@@ -1470,6 +1470,183 @@ constants/constants.rb:
 #   73|       getAnOperand/getLeftOperand: [ClassVariableAccess] @@fourty_six
 #   73|       getAnOperand/getRightOperand: [ConstantReadAccess] FOURTY_SIX
 #   73|         getScopeExpr: [ConstantReadAccess] Mod3
+escape_sequences/escapes.rb:
+#    1| [Toplevel] escapes.rb
+#    6|   getStmt: [StringLiteral] "\'"
+#    6|     getComponent: [StringTextComponent] \'
+#    7|   getStmt: [StringLiteral] "\""
+#    7|     getComponent: [StringTextComponent] \"
+#    8|   getStmt: [StringLiteral] "\\"
+#    8|     getComponent: [StringTextComponent] \\
+#    9|   getStmt: [StringLiteral] "\1"
+#    9|     getComponent: [StringTextComponent] \1
+#   10|   getStmt: [StringLiteral] "\\1"
+#   10|     getComponent: [StringTextComponent] \\1
+#   11|   getStmt: [StringLiteral] "\141"
+#   11|     getComponent: [StringTextComponent] \141
+#   12|   getStmt: [StringLiteral] "\n"
+#   12|     getComponent: [StringTextComponent] \n
+#   15|   getStmt: [StringLiteral] "\'"
+#   15|     getComponent: [StringEscapeSequenceComponent] \'
+#   16|   getStmt: [StringLiteral] "\""
+#   16|     getComponent: [StringEscapeSequenceComponent] \"
+#   17|   getStmt: [StringLiteral] "\\"
+#   17|     getComponent: [StringEscapeSequenceComponent] \\
+#   18|   getStmt: [StringLiteral] "\1"
+#   18|     getComponent: [StringEscapeSequenceComponent] \1
+#   19|   getStmt: [StringLiteral] "\\1"
+#   19|     getComponent: [StringEscapeSequenceComponent] \\
+#   19|     getComponent: [StringTextComponent] 1
+#   20|   getStmt: [StringLiteral] "\141"
+#   20|     getComponent: [StringEscapeSequenceComponent] \141
+#   21|   getStmt: [StringLiteral] "\x6d"
+#   21|     getComponent: [StringEscapeSequenceComponent] \x6d
+#   22|   getStmt: [StringLiteral] "\x6E"
+#   22|     getComponent: [StringEscapeSequenceComponent] \x6E
+#   23|   getStmt: [StringLiteral] "\X6d"
+#   23|     getComponent: [StringEscapeSequenceComponent] \X
+#   23|     getComponent: [StringTextComponent] 6d
+#   24|   getStmt: [StringLiteral] "\X6E"
+#   24|     getComponent: [StringEscapeSequenceComponent] \X
+#   24|     getComponent: [StringTextComponent] 6E
+#   25|   getStmt: [StringLiteral] "\u203d"
+#   25|     getComponent: [StringEscapeSequenceComponent] \u203d
+#   26|   getStmt: [StringLiteral] "\u{62}"
+#   26|     getComponent: [StringEscapeSequenceComponent] \u{62}
+#   27|   getStmt: [StringLiteral] "\u{1f60a}"
+#   27|     getComponent: [StringEscapeSequenceComponent] \u{1f60a}
+#   28|   getStmt: [StringLiteral] "\a"
+#   28|     getComponent: [StringEscapeSequenceComponent] \a
+#   29|   getStmt: [StringLiteral] "\b"
+#   29|     getComponent: [StringEscapeSequenceComponent] \b
+#   30|   getStmt: [StringLiteral] "\t"
+#   30|     getComponent: [StringEscapeSequenceComponent] \t
+#   31|   getStmt: [StringLiteral] "\n"
+#   31|     getComponent: [StringEscapeSequenceComponent] \n
+#   32|   getStmt: [StringLiteral] "\v"
+#   32|     getComponent: [StringEscapeSequenceComponent] \v
+#   33|   getStmt: [StringLiteral] "\f"
+#   33|     getComponent: [StringEscapeSequenceComponent] \f
+#   34|   getStmt: [StringLiteral] "\r"
+#   34|     getComponent: [StringEscapeSequenceComponent] \r
+#   35|   getStmt: [StringLiteral] "\e"
+#   35|     getComponent: [StringEscapeSequenceComponent] \e
+#   36|   getStmt: [StringLiteral] "\s"
+#   36|     getComponent: [StringEscapeSequenceComponent] \s
+#   37|   getStmt: [StringLiteral] "\c?"
+#   37|     getComponent: [StringEscapeSequenceComponent] \c
+#   37|     getComponent: [StringTextComponent] ?
+#   38|   getStmt: [StringLiteral] "\C-?"
+#   38|     getComponent: [StringEscapeSequenceComponent] \C
+#   38|     getComponent: [StringTextComponent] -?
+#   43|   getStmt: [AssignExpr] ... = ...
+#   43|     getAnOperand/getLeftOperand: [LocalVariableAccess] a
+#   43|     getAnOperand/getRightOperand: [StringLiteral] "\\."
+#   43|       getComponent: [StringEscapeSequenceComponent] \\
+#   43|       getComponent: [StringTextComponent] .
+#   44|   getStmt: [StringLiteral] "#{...}"
+#   44|     getComponent: [StringInterpolationComponent] #{...}
+#   44|       getStmt: [LocalVariableAccess] a
+#   48|   getStmt: [RegExpLiteral] /\n/
+#   48|     getParsed: [RegExpConstant, RegExpEscape] \n
+#   48|     getComponent: [RegExpEscapeSequenceComponent] \n
+#   49|   getStmt: [RegExpLiteral] /\p/
+#   49|     getParsed: [RegExpConstant, RegExpEscape] \p
+#   49|     getComponent: [RegExpEscapeSequenceComponent] \p
+#   50|   getStmt: [RegExpLiteral] /\u0061/
+#   50|     getParsed: [RegExpConstant, RegExpEscape] \u0061
+#   50|     getComponent: [RegExpEscapeSequenceComponent] \u0061
+#   53|   getStmt: [AssignExpr] ... = ...
+#   53|     getAnOperand/getLeftOperand: [LocalVariableAccess] a
+#   53|     getAnOperand/getRightOperand: [StringLiteral] "\\."
+#   53|       getComponent: [StringEscapeSequenceComponent] \\
+#   53|       getComponent: [StringTextComponent] .
+#   54|   getStmt: [AssignExpr] ... = ...
+#   54|     getAnOperand/getLeftOperand: [LocalVariableAccess] b
+#   54|     getAnOperand/getRightOperand: [RegExpLiteral] /\./
+#   54|       getParsed: [RegExpConstant, RegExpEscape] \.
+#   54|       getComponent: [RegExpEscapeSequenceComponent] \.
+#   55|   getStmt: [RegExpLiteral] /#{...}#{...}/
+#   55|     getParsed: [RegExpSequence] \.\.
+#   55|       0: [RegExpConstant, RegExpEscape] \.
+#   55|       1: [RegExpConstant, RegExpEscape] \.
+#   55|     getComponent: [RegExpInterpolationComponent] #{...}
+#   55|       getStmt: [LocalVariableAccess] a
+#   55|     getComponent: [RegExpInterpolationComponent] #{...}
+#   55|       getStmt: [LocalVariableAccess] b
+#   58|   getStmt: [ArrayLiteral] %w(...)
+#   58|     getElement: [StringLiteral] "foo \n"
+#   58|       getComponent: [StringTextComponent] foo
+#   58|       getComponent: [StringEscapeSequenceComponent]  \n
+#   58|     getElement: [StringLiteral] "bar"
+#   58|       getComponent: [StringTextComponent] bar
+#   61|   getStmt: [SymbolLiteral] :"\'"
+#   61|     getComponent: [StringTextComponent] \'
+#   62|   getStmt: [SymbolLiteral] :"\""
+#   62|     getComponent: [StringTextComponent] \"
+#   63|   getStmt: [SymbolLiteral] :"\\"
+#   63|     getComponent: [StringTextComponent] \\
+#   64|   getStmt: [SymbolLiteral] :"\1"
+#   64|     getComponent: [StringTextComponent] \1
+#   65|   getStmt: [SymbolLiteral] :"\\1"
+#   65|     getComponent: [StringTextComponent] \\1
+#   66|   getStmt: [SymbolLiteral] :"\141"
+#   66|     getComponent: [StringTextComponent] \141
+#   67|   getStmt: [SymbolLiteral] :"\n"
+#   67|     getComponent: [StringTextComponent] \n
+#   70|   getStmt: [SymbolLiteral] :"\'"
+#   70|     getComponent: [StringEscapeSequenceComponent] \'
+#   71|   getStmt: [SymbolLiteral] :"\""
+#   71|     getComponent: [StringEscapeSequenceComponent] \"
+#   72|   getStmt: [SymbolLiteral] :"\\"
+#   72|     getComponent: [StringEscapeSequenceComponent] \\
+#   73|   getStmt: [SymbolLiteral] :"\1"
+#   73|     getComponent: [StringEscapeSequenceComponent] \1
+#   74|   getStmt: [SymbolLiteral] :"\\1"
+#   74|     getComponent: [StringEscapeSequenceComponent] \\
+#   74|     getComponent: [StringTextComponent] 1
+#   75|   getStmt: [SymbolLiteral] :"\141"
+#   75|     getComponent: [StringEscapeSequenceComponent] \141
+#   76|   getStmt: [SymbolLiteral] :"\x6d"
+#   76|     getComponent: [StringEscapeSequenceComponent] \x6d
+#   77|   getStmt: [SymbolLiteral] :"\x6E"
+#   77|     getComponent: [StringEscapeSequenceComponent] \x6E
+#   78|   getStmt: [SymbolLiteral] :"\X6d"
+#   78|     getComponent: [StringEscapeSequenceComponent] \X
+#   78|     getComponent: [StringTextComponent] 6d
+#   79|   getStmt: [SymbolLiteral] :"\X6E"
+#   79|     getComponent: [StringEscapeSequenceComponent] \X
+#   79|     getComponent: [StringTextComponent] 6E
+#   80|   getStmt: [SymbolLiteral] :"\u203d"
+#   80|     getComponent: [StringEscapeSequenceComponent] \u203d
+#   81|   getStmt: [SymbolLiteral] :"\u{62}"
+#   81|     getComponent: [StringEscapeSequenceComponent] \u{62}
+#   82|   getStmt: [SymbolLiteral] :"\u{1f60a}"
+#   82|     getComponent: [StringEscapeSequenceComponent] \u{1f60a}
+#   83|   getStmt: [SymbolLiteral] :"\a"
+#   83|     getComponent: [StringEscapeSequenceComponent] \a
+#   84|   getStmt: [SymbolLiteral] :"\b"
+#   84|     getComponent: [StringEscapeSequenceComponent] \b
+#   85|   getStmt: [SymbolLiteral] :"\t"
+#   85|     getComponent: [StringEscapeSequenceComponent] \t
+#   86|   getStmt: [SymbolLiteral] :"\n"
+#   86|     getComponent: [StringEscapeSequenceComponent] \n
+#   87|   getStmt: [SymbolLiteral] :"\v"
+#   87|     getComponent: [StringEscapeSequenceComponent] \v
+#   88|   getStmt: [SymbolLiteral] :"\f"
+#   88|     getComponent: [StringEscapeSequenceComponent] \f
+#   89|   getStmt: [SymbolLiteral] :"\r"
+#   89|     getComponent: [StringEscapeSequenceComponent] \r
+#   90|   getStmt: [SymbolLiteral] :"\e"
+#   90|     getComponent: [StringEscapeSequenceComponent] \e
+#   91|   getStmt: [SymbolLiteral] :"\s"
+#   91|     getComponent: [StringEscapeSequenceComponent] \s
+#   92|   getStmt: [SymbolLiteral] :"\c?"
+#   92|     getComponent: [StringEscapeSequenceComponent] \c
+#   92|     getComponent: [StringTextComponent] ?
+#   93|   getStmt: [SymbolLiteral] :"\C-?"
+#   93|     getComponent: [StringEscapeSequenceComponent] \C
+#   93|     getComponent: [StringTextComponent] -?
 literals/literals.rb:
 #    1| [Toplevel] literals.rb
 #    2|   getStmt: [NilLiteral] nil
@@ -1482,495 +1659,508 @@ literals/literals.rb:
 #   11|   getStmt: [IntegerLiteral] 5_678
 #   12|   getStmt: [IntegerLiteral] 0
 #   13|   getStmt: [IntegerLiteral] 0d900
-#   16|   getStmt: [IntegerLiteral] 0x1234
-#   17|   getStmt: [IntegerLiteral] 0xdeadbeef
-#   18|   getStmt: [IntegerLiteral] 0xF00D_face
-#   21|   getStmt: [IntegerLiteral] 0123
-#   22|   getStmt: [IntegerLiteral] 0o234
-#   23|   getStmt: [IntegerLiteral] 0O45_6
-#   26|   getStmt: [IntegerLiteral] 0b10010100
-#   27|   getStmt: [IntegerLiteral] 0B011_01101
-#   30|   getStmt: [FloatLiteral] 12.34
-#   31|   getStmt: [FloatLiteral] 1234e-2
-#   32|   getStmt: [FloatLiteral] 1.234E1
-#   35|   getStmt: [RationalLiteral] 23r
-#   36|   getStmt: [RationalLiteral] 9.85r
-#   39|   getStmt: [ComplexLiteral] 2i
-#   46|   getStmt: [StringLiteral] ""
-#   47|   getStmt: [StringLiteral] ""
-#   48|   getStmt: [StringLiteral] "hello"
-#   48|     getComponent: [StringTextComponent] hello
-#   49|   getStmt: [StringLiteral] "goodbye"
-#   49|     getComponent: [StringTextComponent] goodbye
-#   50|   getStmt: [StringLiteral] "string with escaped \" quote"
-#   50|     getComponent: [StringTextComponent] string with escaped 
-#   50|     getComponent: [StringEscapeSequenceComponent] \"
-#   50|     getComponent: [StringTextComponent]  quote
-#   51|   getStmt: [StringLiteral] "string with " quote"
-#   51|     getComponent: [StringTextComponent] string with " quote
-#   52|   getStmt: [StringLiteral] "foo bar baz"
-#   52|     getComponent: [StringTextComponent] foo bar baz
-#   53|   getStmt: [StringLiteral] "foo bar baz"
-#   53|     getComponent: [StringTextComponent] foo bar baz
-#   54|   getStmt: [StringLiteral] "foo ' bar " baz'"
-#   54|     getComponent: [StringTextComponent] foo ' bar " baz'
-#   55|   getStmt: [StringLiteral] "FOO ' BAR " BAZ'"
-#   55|     getComponent: [StringTextComponent] FOO ' BAR " BAZ'
-#   56|   getStmt: [StringLiteral] "foo\ bar"
-#   56|     getComponent: [StringTextComponent] foo\ bar
-#   57|   getStmt: [StringLiteral] "foo\ bar"
-#   57|     getComponent: [StringTextComponent] foo
-#   57|     getComponent: [StringEscapeSequenceComponent] \ 
-#   57|     getComponent: [StringTextComponent] bar
-#   58|   getStmt: [StringLiteral] "2 + 2 = #{...}"
-#   58|     getComponent: [StringTextComponent] 2 + 2 = 
-#   58|     getComponent: [StringInterpolationComponent] #{...}
-#   58|       getStmt: [AddExpr] ... + ...
-#   58|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
-#   58|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
-#   59|   getStmt: [StringLiteral] "3 + 4 = #{...}"
-#   59|     getComponent: [StringTextComponent] 3 + 4 = 
-#   59|     getComponent: [StringInterpolationComponent] #{...}
-#   59|       getStmt: [AddExpr] ... + ...
-#   59|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 3
-#   59|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
-#   60|   getStmt: [StringLiteral] "2 + 2 = #{ 2 + 2 }"
-#   60|     getComponent: [StringTextComponent] 2 + 2 = #{ 2 + 2 }
-#   61|   getStmt: [StringLiteral] "3 + 4 = #{ 3 + 4 }"
-#   61|     getComponent: [StringTextComponent] 3 + 4 = #{ 3 + 4 }
-#   62|   getStmt: [StringConcatenation] "..." "..."
-#   62|     getString: [StringLiteral] "foo"
-#   62|       getComponent: [StringTextComponent] foo
-#   62|     getString: [StringLiteral] "bar"
-#   62|       getComponent: [StringTextComponent] bar
-#   62|     getString: [StringLiteral] "baz"
-#   62|       getComponent: [StringTextComponent] baz
-#   63|   getStmt: [StringConcatenation] "..." "..."
-#   63|     getString: [StringLiteral] "foo"
-#   63|       getComponent: [StringTextComponent] foo
-#   63|     getString: [StringLiteral] "bar"
-#   63|       getComponent: [StringTextComponent] bar
-#   63|     getString: [StringLiteral] "baz"
-#   63|       getComponent: [StringTextComponent] baz
-#   64|   getStmt: [StringConcatenation] "..." "..."
-#   64|     getString: [StringLiteral] "foo"
-#   64|       getComponent: [StringTextComponent] foo
-#   64|     getString: [StringLiteral] "bar#{...}"
-#   64|       getComponent: [StringTextComponent] bar
-#   64|       getComponent: [StringInterpolationComponent] #{...}
-#   64|         getStmt: [MulExpr] ... * ...
-#   64|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#   64|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#   64|     getString: [StringLiteral] "baz"
-#   64|       getComponent: [StringTextComponent] baz
-#   65|   getStmt: [StringLiteral] "foo #{...} qux"
-#   65|     getComponent: [StringTextComponent] foo 
-#   65|     getComponent: [StringInterpolationComponent] #{...}
-#   65|       getStmt: [StringLiteral] "bar #{...} baz"
-#   65|         getComponent: [StringTextComponent] bar 
-#   65|         getComponent: [StringInterpolationComponent] #{...}
-#   65|           getStmt: [AddExpr] ... + ...
-#   65|             getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
-#   65|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 3
-#   65|         getComponent: [StringTextComponent]  baz
-#   65|     getComponent: [StringTextComponent]  qux
-#   66|   getStmt: [StringLiteral] "foo #{...}"
-#   66|     getComponent: [StringTextComponent] foo 
-#   66|     getComponent: [StringInterpolationComponent] #{...}
-#   66|       getStmt: [MethodCall] call to blah
-#   66|         getReceiver: [Self, SelfVariableAccess] self
-#   66|       getStmt: [AddExpr] ... + ...
-#   66|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#   66|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 9
-#   67|   getStmt: [AssignExpr] ... = ...
-#   67|     getAnOperand/getLeftOperand: [LocalVariableAccess] bar
-#   67|     getAnOperand/getRightOperand: [StringLiteral] "bar"
-#   67|       getComponent: [StringTextComponent] bar
-#   68|   getStmt: [AssignExpr] ... = ...
-#   68|     getAnOperand/getLeftOperand: [ConstantAssignment] BAR
-#   68|     getAnOperand/getRightOperand: [StringLiteral] "bar"
-#   68|       getComponent: [StringTextComponent] bar
-#   69|   getStmt: [StringLiteral] "foo #{...}"
-#   69|     getComponent: [StringTextComponent] foo 
-#   69|     getComponent: [StringInterpolationComponent] #{...}
-#   69|       getStmt: [LocalVariableAccess] bar
-#   70|   getStmt: [StringLiteral] "foo #{...}"
-#   70|     getComponent: [StringTextComponent] foo 
-#   70|     getComponent: [StringInterpolationComponent] #{...}
-#   70|       getStmt: [ConstantReadAccess] BAR
-#   73|   getStmt: [CharacterLiteral] ?x
-#   74|   getStmt: [CharacterLiteral] ?\n
-#   75|   getStmt: [CharacterLiteral] ?\s
-#   76|   getStmt: [CharacterLiteral] ?\\
-#   77|   getStmt: [CharacterLiteral] ?\u{58}
-#   78|   getStmt: [CharacterLiteral] ?\C-a
-#   79|   getStmt: [CharacterLiteral] ?\M-a
-#   80|   getStmt: [CharacterLiteral] ?\M-\C-a
-#   81|   getStmt: [CharacterLiteral] ?\C-\M-a
-#   84|   getStmt: [SymbolLiteral] :""
-#   85|   getStmt: [SymbolLiteral] :hello
-#   86|   getStmt: [SymbolLiteral] :"foo bar"
-#   86|     getComponent: [StringTextComponent] foo bar
-#   87|   getStmt: [SymbolLiteral] :"bar baz"
-#   87|     getComponent: [StringTextComponent] bar baz
-#   88|   getStmt: [HashLiteral] {...}
-#   88|     getElement: [Pair] Pair
-#   88|       getKey: [SymbolLiteral] :foo
-#   88|       getValue: [StringLiteral] "bar"
-#   88|         getComponent: [StringTextComponent] bar
-#   89|   getStmt: [SymbolLiteral] :"wibble"
-#   89|     getComponent: [StringTextComponent] wibble
-#   90|   getStmt: [SymbolLiteral] :"wibble wobble"
-#   90|     getComponent: [StringTextComponent] wibble wobble
-#   91|   getStmt: [SymbolLiteral] :"foo_#{...}_#{...}_#{...}"
-#   91|     getComponent: [StringTextComponent] foo_
-#   91|     getComponent: [StringInterpolationComponent] #{...}
-#   91|       getStmt: [AddExpr] ... + ...
-#   91|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
-#   91|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
-#   91|     getComponent: [StringTextComponent] _
-#   91|     getComponent: [StringInterpolationComponent] #{...}
-#   91|       getStmt: [LocalVariableAccess] bar
-#   91|     getComponent: [StringTextComponent] _
-#   91|     getComponent: [StringInterpolationComponent] #{...}
-#   91|       getStmt: [ConstantReadAccess] BAR
-#   92|   getStmt: [SymbolLiteral] :"foo_#{ 2 + 2}_#{bar}_#{BAR}"
-#   92|     getComponent: [StringTextComponent] foo_#{ 2 + 2}_#{bar}_#{BAR}
-#   93|   getStmt: [SymbolLiteral] :"foo_#{ 3 - 2 }"
-#   93|     getComponent: [StringTextComponent] foo_#{ 3 - 2 }
-#   96|   getStmt: [ArrayLiteral] [...]
-#   97|   getStmt: [ArrayLiteral] [...]
-#   97|     getElement: [IntegerLiteral] 1
-#   97|     getElement: [IntegerLiteral] 2
-#   97|     getElement: [IntegerLiteral] 3
-#   98|   getStmt: [ArrayLiteral] [...]
-#   98|     getElement: [IntegerLiteral] 4
-#   98|     getElement: [IntegerLiteral] 5
-#   98|     getElement: [DivExpr] ... / ...
-#   98|       getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 12
-#   98|       getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
-#   99|   getStmt: [ArrayLiteral] [...]
-#   99|     getElement: [IntegerLiteral] 7
-#   99|     getElement: [ArrayLiteral] [...]
-#   99|       getElement: [IntegerLiteral] 8
-#   99|       getElement: [IntegerLiteral] 9
-#  102|   getStmt: [ArrayLiteral] %w(...)
-#  103|   getStmt: [ArrayLiteral] %w(...)
-#  103|     getElement: [StringLiteral] "foo"
-#  103|       getComponent: [StringTextComponent] foo
-#  103|     getElement: [StringLiteral] "bar"
-#  103|       getComponent: [StringTextComponent] bar
-#  103|     getElement: [StringLiteral] "baz"
-#  103|       getComponent: [StringTextComponent] baz
-#  104|   getStmt: [ArrayLiteral] %w(...)
-#  104|     getElement: [StringLiteral] "foo"
-#  104|       getComponent: [StringTextComponent] foo
-#  104|     getElement: [StringLiteral] "bar"
-#  104|       getComponent: [StringTextComponent] bar
-#  104|     getElement: [StringLiteral] "baz"
-#  104|       getComponent: [StringTextComponent] baz
-#  105|   getStmt: [ArrayLiteral] %w(...)
-#  105|     getElement: [StringLiteral] "foo"
-#  105|       getComponent: [StringTextComponent] foo
-#  105|     getElement: [StringLiteral] "bar#{...}"
-#  105|       getComponent: [StringTextComponent] bar
-#  105|       getComponent: [StringInterpolationComponent] #{...}
-#  105|         getStmt: [AddExpr] ... + ...
-#  105|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#  105|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  105|     getElement: [StringLiteral] "#{...}"
-#  105|       getComponent: [StringInterpolationComponent] #{...}
-#  105|         getStmt: [LocalVariableAccess] bar
-#  105|     getElement: [StringLiteral] "#{...}"
-#  105|       getComponent: [StringInterpolationComponent] #{...}
-#  105|         getStmt: [ConstantReadAccess] BAR
-#  105|     getElement: [StringLiteral] "baz"
-#  105|       getComponent: [StringTextComponent] baz
-#  106|   getStmt: [ArrayLiteral] %w(...)
-#  106|     getElement: [StringLiteral] "foo"
-#  106|       getComponent: [StringTextComponent] foo
-#  106|     getElement: [StringLiteral] "bar#{1+1}"
-#  106|       getComponent: [StringTextComponent] bar#{1+1}
-#  106|     getElement: [StringLiteral] "#{bar}"
-#  106|       getComponent: [StringTextComponent] #{bar}
-#  106|     getElement: [StringLiteral] "#{BAR}"
-#  106|       getComponent: [StringTextComponent] #{BAR}
-#  106|     getElement: [StringLiteral] "baz"
-#  106|       getComponent: [StringTextComponent] baz
-#  109|   getStmt: [ArrayLiteral] %i(...)
-#  110|   getStmt: [ArrayLiteral] %i(...)
-#  110|     getElement: [SymbolLiteral] :"foo"
-#  110|       getComponent: [StringTextComponent] foo
-#  110|     getElement: [SymbolLiteral] :"bar"
-#  110|       getComponent: [StringTextComponent] bar
-#  110|     getElement: [SymbolLiteral] :"baz"
-#  110|       getComponent: [StringTextComponent] baz
-#  111|   getStmt: [ArrayLiteral] %i(...)
-#  111|     getElement: [SymbolLiteral] :"foo"
-#  111|       getComponent: [StringTextComponent] foo
-#  111|     getElement: [SymbolLiteral] :"bar"
-#  111|       getComponent: [StringTextComponent] bar
-#  111|     getElement: [SymbolLiteral] :"baz"
-#  111|       getComponent: [StringTextComponent] baz
-#  112|   getStmt: [ArrayLiteral] %i(...)
-#  112|     getElement: [SymbolLiteral] :"foo"
-#  112|       getComponent: [StringTextComponent] foo
-#  112|     getElement: [SymbolLiteral] :"bar#{...}"
-#  112|       getComponent: [StringTextComponent] bar
-#  112|       getComponent: [StringInterpolationComponent] #{...}
-#  112|         getStmt: [AddExpr] ... + ...
-#  112|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
-#  112|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
-#  112|     getElement: [SymbolLiteral] :"#{...}"
-#  112|       getComponent: [StringInterpolationComponent] #{...}
-#  112|         getStmt: [LocalVariableAccess] bar
-#  112|     getElement: [SymbolLiteral] :"#{...}"
-#  112|       getComponent: [StringInterpolationComponent] #{...}
-#  112|         getStmt: [ConstantReadAccess] BAR
-#  112|     getElement: [SymbolLiteral] :"baz"
-#  112|       getComponent: [StringTextComponent] baz
-#  113|   getStmt: [ArrayLiteral] %i(...)
-#  113|     getElement: [SymbolLiteral] :"foo"
-#  113|       getComponent: [StringTextComponent] foo
-#  113|     getElement: [SymbolLiteral] :"bar#{"
-#  113|       getComponent: [StringTextComponent] bar#{
-#  113|     getElement: [SymbolLiteral] :"2"
-#  113|       getComponent: [StringTextComponent] 2
-#  113|     getElement: [SymbolLiteral] :"+"
-#  113|       getComponent: [StringTextComponent] +
-#  113|     getElement: [SymbolLiteral] :"4"
-#  113|       getComponent: [StringTextComponent] 4
-#  113|     getElement: [SymbolLiteral] :"}"
-#  113|       getComponent: [StringTextComponent] }
-#  113|     getElement: [SymbolLiteral] :"#{bar}"
-#  113|       getComponent: [StringTextComponent] #{bar}
-#  113|     getElement: [SymbolLiteral] :"#{BAR}"
-#  113|       getComponent: [StringTextComponent] #{BAR}
-#  113|     getElement: [SymbolLiteral] :"baz"
-#  113|       getComponent: [StringTextComponent] baz
-#  116|   getStmt: [HashLiteral] {...}
-#  117|   getStmt: [HashLiteral] {...}
-#  117|     getElement: [Pair] Pair
-#  117|       getKey: [SymbolLiteral] :foo
-#  117|       getValue: [IntegerLiteral] 1
-#  117|     getElement: [Pair] Pair
-#  117|       getKey: [SymbolLiteral] :bar
-#  117|       getValue: [IntegerLiteral] 2
-#  117|     getElement: [Pair] Pair
-#  117|       getKey: [StringLiteral] "baz"
-#  117|         getComponent: [StringTextComponent] baz
-#  117|       getValue: [IntegerLiteral] 3
-#  118|   getStmt: [HashLiteral] {...}
-#  118|     getElement: [Pair] Pair
-#  118|       getKey: [SymbolLiteral] :foo
-#  118|       getValue: [IntegerLiteral] 7
-#  118|     getElement: [HashSplatExpr] ** ...
-#  118|       getAnOperand/getOperand/getReceiver: [MethodCall] call to baz
-#  118|         getReceiver: [Self, SelfVariableAccess] self
-#  121|   getStmt: [ParenthesizedExpr] ( ... )
-#  121|     getStmt: [RangeLiteral] _ .. _
-#  121|       getBegin: [IntegerLiteral] 1
-#  121|       getEnd: [IntegerLiteral] 10
-#  122|   getStmt: [ParenthesizedExpr] ( ... )
-#  122|     getStmt: [RangeLiteral] _ ... _
-#  122|       getBegin: [IntegerLiteral] 1
-#  122|       getEnd: [IntegerLiteral] 10
-#  123|   getStmt: [ParenthesizedExpr] ( ... )
-#  123|     getStmt: [RangeLiteral] _ .. _
-#  123|       getBegin: [IntegerLiteral] 1
-#  123|       getEnd: [IntegerLiteral] 0
-#  124|   getStmt: [ParenthesizedExpr] ( ... )
-#  124|     getStmt: [RangeLiteral] _ .. _
-#  124|       getBegin: [MethodCall] call to start
-#  124|         getReceiver: [Self, SelfVariableAccess] self
-#  124|       getEnd: [AddExpr] ... + ...
-#  124|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
-#  124|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 3
-#  125|   getStmt: [ParenthesizedExpr] ( ... )
-#  125|     getStmt: [RangeLiteral] _ .. _
-#  125|       getBegin: [IntegerLiteral] 1
-#  126|   getStmt: [ParenthesizedExpr] ( ... )
-#  126|     getStmt: [RangeLiteral] _ .. _
-#  126|       getEnd: [IntegerLiteral] 1
-#  127|   getStmt: [ParenthesizedExpr] ( ... )
-#  127|     getStmt: [SubExpr] ... - ...
-#  127|       getAnOperand/getLeftOperand/getReceiver: [RangeLiteral] _ .. _
-#  127|         getBegin: [IntegerLiteral] 0
-#  127|       getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  130|   getStmt: [SubshellLiteral] `ls -l`
-#  130|     getComponent: [StringTextComponent] ls -l
-#  131|   getStmt: [SubshellLiteral] `ls -l`
-#  131|     getComponent: [StringTextComponent] ls -l
-#  132|   getStmt: [SubshellLiteral] `du -d #{...} #{...} #{...}`
-#  132|     getComponent: [StringTextComponent] du -d 
-#  132|     getComponent: [StringInterpolationComponent] #{...}
-#  132|       getStmt: [AddExpr] ... + ...
-#  132|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#  132|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  132|     getComponent: [StringTextComponent]  
-#  132|     getComponent: [StringInterpolationComponent] #{...}
-#  132|       getStmt: [LocalVariableAccess] bar
-#  132|     getComponent: [StringTextComponent]  
-#  132|     getComponent: [StringInterpolationComponent] #{...}
-#  132|       getStmt: [ConstantReadAccess] BAR
-#  133|   getStmt: [SubshellLiteral] `du -d #{...}`
-#  133|     getComponent: [StringTextComponent] du -d 
-#  133|     getComponent: [StringInterpolationComponent] #{...}
-#  133|       getStmt: [SubExpr] ... - ...
-#  133|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 5
-#  133|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
-#  136|   getStmt: [RegExpLiteral] //
-#  137|   getStmt: [RegExpLiteral] /foo/
-#  137|     getParsed: [RegExpConstant, RegExpNormalChar] foo
-#  137|     getComponent: [RegExpTextComponent] foo
-#  138|   getStmt: [RegExpLiteral] /foo/
-#  138|     getParsed: [RegExpConstant, RegExpNormalChar] foo
-#  138|     getComponent: [RegExpTextComponent] foo
-#  139|   getStmt: [RegExpLiteral] /foo+\sbar\S/
-#  139|     getParsed: [RegExpSequence] foo+\sbar\S
-#  139|       0: [RegExpConstant, RegExpNormalChar] fo
-#  139|       1: [RegExpPlus] o+
-#  139|         0: [RegExpConstant, RegExpNormalChar] o
-#  139|       2: [RegExpCharacterClassEscape] \s
-#  139|       3: [RegExpConstant, RegExpNormalChar] bar
-#  139|       4: [RegExpCharacterClassEscape] \S
-#  139|     getComponent: [RegExpTextComponent] foo+
-#  139|     getComponent: [RegExpEscapeSequenceComponent] \s
-#  139|     getComponent: [RegExpTextComponent] bar
-#  139|     getComponent: [RegExpEscapeSequenceComponent] \S
-#  140|   getStmt: [RegExpLiteral] /foo#{...}bar#{...}#{...}/
-#  140|     getParsed: [RegExpConstant, RegExpNormalChar] foo2barbarbar
-#  140|     getComponent: [RegExpTextComponent] foo
-#  140|     getComponent: [RegExpInterpolationComponent] #{...}
-#  140|       getStmt: [AddExpr] ... + ...
-#  140|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#  140|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  140|     getComponent: [RegExpTextComponent] bar
-#  140|     getComponent: [RegExpInterpolationComponent] #{...}
-#  140|       getStmt: [LocalVariableAccess] bar
-#  140|     getComponent: [RegExpInterpolationComponent] #{...}
-#  140|       getStmt: [ConstantReadAccess] BAR
-#  141|   getStmt: [RegExpLiteral] /foo/
-#  141|     getComponent: [RegExpTextComponent] foo
-#  142|   getStmt: [RegExpLiteral] //
-#  143|   getStmt: [RegExpLiteral] /foo/
-#  143|     getParsed: [RegExpConstant, RegExpNormalChar] foo
-#  143|     getComponent: [RegExpTextComponent] foo
-#  144|   getStmt: [RegExpLiteral] /foo/
-#  144|     getParsed: [RegExpConstant, RegExpNormalChar] foo
-#  144|     getComponent: [RegExpTextComponent] foo
-#  145|   getStmt: [RegExpLiteral] /foo+\sbar\S/
-#  145|     getParsed: [RegExpSequence] foo+\sbar\S
-#  145|       0: [RegExpConstant, RegExpNormalChar] fo
-#  145|       1: [RegExpPlus] o+
-#  145|         0: [RegExpConstant, RegExpNormalChar] o
-#  145|       2: [RegExpCharacterClassEscape] \s
-#  145|       3: [RegExpConstant, RegExpNormalChar] bar
-#  145|       4: [RegExpCharacterClassEscape] \S
-#  145|     getComponent: [RegExpTextComponent] foo+
-#  145|     getComponent: [RegExpEscapeSequenceComponent] \s
-#  145|     getComponent: [RegExpTextComponent] bar
-#  145|     getComponent: [RegExpEscapeSequenceComponent] \S
-#  146|   getStmt: [RegExpLiteral] /foo#{...}bar#{...}#{...}/
-#  146|     getParsed: [RegExpConstant, RegExpNormalChar] foo2barbarbar
-#  146|     getComponent: [RegExpTextComponent] foo
-#  146|     getComponent: [RegExpInterpolationComponent] #{...}
-#  146|       getStmt: [AddExpr] ... + ...
-#  146|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#  146|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  146|     getComponent: [RegExpTextComponent] bar
-#  146|     getComponent: [RegExpInterpolationComponent] #{...}
-#  146|       getStmt: [LocalVariableAccess] bar
-#  146|     getComponent: [RegExpInterpolationComponent] #{...}
-#  146|       getStmt: [ConstantReadAccess] BAR
-#  147|   getStmt: [RegExpLiteral] /foo/
-#  147|     getComponent: [RegExpTextComponent] foo
-#  150|   getStmt: [StringLiteral] "abcdefghijklmnopqrstuvwxyzabcdef"
-#  150|     getComponent: [StringTextComponent] abcdefghijklmnopqrstuvwxyzabcdef
-#  151|   getStmt: [StringLiteral] "foobarfoobarfoobarfoobarfooba..."
-#  151|     getComponent: [StringTextComponent] foobarfoobarfoobarfoobarfoobarfoo
-#  152|   getStmt: [StringLiteral] "foobar\\foobar\\foobar\\fooba..."
-#  152|     getComponent: [StringTextComponent] foobar
-#  152|     getComponent: [StringEscapeSequenceComponent] \\
-#  152|     getComponent: [StringTextComponent] foobar
-#  152|     getComponent: [StringEscapeSequenceComponent] \\
-#  152|     getComponent: [StringTextComponent] foobar
-#  152|     getComponent: [StringEscapeSequenceComponent] \\
-#  152|     getComponent: [StringTextComponent] foobar
-#  152|     getComponent: [StringEscapeSequenceComponent] \\
-#  152|     getComponent: [StringTextComponent] foobar
-#  155|   getStmt: [MethodCall] call to run_sql
-#  155|     getReceiver: [Self, SelfVariableAccess] self
-#  155|     getArgument: [HereDoc] <<SQL
-#  155|       getComponent: [StringTextComponent] 
-#  155|       select * from table
-#  155|       
-#  155|     getArgument: [HereDoc] <<SQL
-#  157|       getComponent: [StringTextComponent] 
-#  157|       where name = 
-#  158|       getComponent: [StringInterpolationComponent] #{...}
-#  158|         getStmt: [MethodCall] call to name
-#  158|           getReceiver: [Self, SelfVariableAccess] self
-#  158|       getComponent: [StringTextComponent] 
-#  158|       
-#  161|   getStmt: [Method] m
-#  162|     getStmt: [AssignExpr] ... = ...
-#  162|       getAnOperand/getLeftOperand: [LocalVariableAccess] query
-#  162|       getAnOperand/getRightOperand: [HereDoc] <<-BLA
-#  162|         getComponent: [StringTextComponent] 
-#  162|         some text
-#  163|         getComponent: [StringEscapeSequenceComponent] \n
-#  163|         getComponent: [StringTextComponent] and some more
-#  163|           
-#  167|   getStmt: [AssignExpr] ... = ...
-#  167|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
-#  167|     getAnOperand/getRightOperand: [HereDoc] <<~SQUIGGLY
-#  167|       getComponent: [StringTextComponent] 
-#  167|          indented stuff
-#  167|       
-#  171|   getStmt: [AssignExpr] ... = ...
-#  171|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
-#  171|     getAnOperand/getRightOperand: [HereDoc] <<"DOC"
+#   14|   getStmt: [IntegerLiteral] 2147483647
+#   15|   getStmt: [IntegerLiteral] 2147483648
+#   18|   getStmt: [IntegerLiteral] 0x1234
+#   19|   getStmt: [IntegerLiteral] 0xbeef
+#   20|   getStmt: [IntegerLiteral] 0xF0_0D
+#   21|   getStmt: [IntegerLiteral] 0x000000000000000000ff
+#   22|   getStmt: [IntegerLiteral] 0x7FFF_FFFF
+#   23|   getStmt: [IntegerLiteral] 0x80000000
+#   24|   getStmt: [IntegerLiteral] 0xdeadbeef
+#   25|   getStmt: [IntegerLiteral] 0xF00D_face
+#   28|   getStmt: [IntegerLiteral] 0123
+#   29|   getStmt: [IntegerLiteral] 0o234
+#   30|   getStmt: [IntegerLiteral] 0O45_6
+#   31|   getStmt: [IntegerLiteral] 0000000000000000000000000000010
+#   32|   getStmt: [IntegerLiteral] 017777777777
+#   33|   getStmt: [IntegerLiteral] 020000000000
+#   36|   getStmt: [IntegerLiteral] 0b10010100
+#   37|   getStmt: [IntegerLiteral] 0B011_01101
+#   38|   getStmt: [IntegerLiteral] 0b00000000000000000000000000000000000000011
+#   39|   getStmt: [IntegerLiteral] 0b01111111111111111111111111111111
+#   40|   getStmt: [IntegerLiteral] 0b10000000000000000000000000000000
+#   43|   getStmt: [FloatLiteral] 12.34
+#   44|   getStmt: [FloatLiteral] 1234e-2
+#   45|   getStmt: [FloatLiteral] 1.234E1
+#   48|   getStmt: [RationalLiteral] 23r
+#   49|   getStmt: [RationalLiteral] 9.85r
+#   52|   getStmt: [ComplexLiteral] 2i
+#   59|   getStmt: [StringLiteral] ""
+#   60|   getStmt: [StringLiteral] ""
+#   61|   getStmt: [StringLiteral] "hello"
+#   61|     getComponent: [StringTextComponent] hello
+#   62|   getStmt: [StringLiteral] "goodbye"
+#   62|     getComponent: [StringTextComponent] goodbye
+#   63|   getStmt: [StringLiteral] "string with escaped \" quote"
+#   63|     getComponent: [StringTextComponent] string with escaped 
+#   63|     getComponent: [StringEscapeSequenceComponent] \"
+#   63|     getComponent: [StringTextComponent]  quote
+#   64|   getStmt: [StringLiteral] "string with " quote"
+#   64|     getComponent: [StringTextComponent] string with " quote
+#   65|   getStmt: [StringLiteral] "foo bar baz"
+#   65|     getComponent: [StringTextComponent] foo bar baz
+#   66|   getStmt: [StringLiteral] "foo bar baz"
+#   66|     getComponent: [StringTextComponent] foo bar baz
+#   67|   getStmt: [StringLiteral] "foo ' bar " baz'"
+#   67|     getComponent: [StringTextComponent] foo ' bar " baz'
+#   68|   getStmt: [StringLiteral] "FOO ' BAR " BAZ'"
+#   68|     getComponent: [StringTextComponent] FOO ' BAR " BAZ'
+#   69|   getStmt: [StringLiteral] "foo\ bar"
+#   69|     getComponent: [StringTextComponent] foo\ bar
+#   70|   getStmt: [StringLiteral] "foo\ bar"
+#   70|     getComponent: [StringTextComponent] foo
+#   70|     getComponent: [StringEscapeSequenceComponent] \ 
+#   70|     getComponent: [StringTextComponent] bar
+#   71|   getStmt: [StringLiteral] "2 + 2 = #{...}"
+#   71|     getComponent: [StringTextComponent] 2 + 2 = 
+#   71|     getComponent: [StringInterpolationComponent] #{...}
+#   71|       getStmt: [AddExpr] ... + ...
+#   71|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
+#   71|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
+#   72|   getStmt: [StringLiteral] "3 + 4 = #{...}"
+#   72|     getComponent: [StringTextComponent] 3 + 4 = 
+#   72|     getComponent: [StringInterpolationComponent] #{...}
+#   72|       getStmt: [AddExpr] ... + ...
+#   72|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 3
+#   72|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
+#   73|   getStmt: [StringLiteral] "2 + 2 = #{ 2 + 2 }"
+#   73|     getComponent: [StringTextComponent] 2 + 2 = #{ 2 + 2 }
+#   74|   getStmt: [StringLiteral] "3 + 4 = #{ 3 + 4 }"
+#   74|     getComponent: [StringTextComponent] 3 + 4 = #{ 3 + 4 }
+#   75|   getStmt: [StringConcatenation] "..." "..."
+#   75|     getString: [StringLiteral] "foo"
+#   75|       getComponent: [StringTextComponent] foo
+#   75|     getString: [StringLiteral] "bar"
+#   75|       getComponent: [StringTextComponent] bar
+#   75|     getString: [StringLiteral] "baz"
+#   75|       getComponent: [StringTextComponent] baz
+#   76|   getStmt: [StringConcatenation] "..." "..."
+#   76|     getString: [StringLiteral] "foo"
+#   76|       getComponent: [StringTextComponent] foo
+#   76|     getString: [StringLiteral] "bar"
+#   76|       getComponent: [StringTextComponent] bar
+#   76|     getString: [StringLiteral] "baz"
+#   76|       getComponent: [StringTextComponent] baz
+#   77|   getStmt: [StringConcatenation] "..." "..."
+#   77|     getString: [StringLiteral] "foo"
+#   77|       getComponent: [StringTextComponent] foo
+#   77|     getString: [StringLiteral] "bar#{...}"
+#   77|       getComponent: [StringTextComponent] bar
+#   77|       getComponent: [StringInterpolationComponent] #{...}
+#   77|         getStmt: [MulExpr] ... * ...
+#   77|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#   77|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#   77|     getString: [StringLiteral] "baz"
+#   77|       getComponent: [StringTextComponent] baz
+#   78|   getStmt: [StringLiteral] "foo #{...} qux"
+#   78|     getComponent: [StringTextComponent] foo 
+#   78|     getComponent: [StringInterpolationComponent] #{...}
+#   78|       getStmt: [StringLiteral] "bar #{...} baz"
+#   78|         getComponent: [StringTextComponent] bar 
+#   78|         getComponent: [StringInterpolationComponent] #{...}
+#   78|           getStmt: [AddExpr] ... + ...
+#   78|             getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
+#   78|             getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 3
+#   78|         getComponent: [StringTextComponent]  baz
+#   78|     getComponent: [StringTextComponent]  qux
+#   79|   getStmt: [StringLiteral] "foo #{...}"
+#   79|     getComponent: [StringTextComponent] foo 
+#   79|     getComponent: [StringInterpolationComponent] #{...}
+#   79|       getStmt: [MethodCall] call to blah
+#   79|         getReceiver: [SelfVariableAccess] self
+#   79|       getStmt: [AddExpr] ... + ...
+#   79|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#   79|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 9
+#   80|   getStmt: [AssignExpr] ... = ...
+#   80|     getAnOperand/getLeftOperand: [LocalVariableAccess] bar
+#   80|     getAnOperand/getRightOperand: [StringLiteral] "bar"
+#   80|       getComponent: [StringTextComponent] bar
+#   81|   getStmt: [AssignExpr] ... = ...
+#   81|     getAnOperand/getLeftOperand: [ConstantAssignment] BAR
+#   81|     getAnOperand/getRightOperand: [StringLiteral] "bar"
+#   81|       getComponent: [StringTextComponent] bar
+#   82|   getStmt: [StringLiteral] "foo #{...}"
+#   82|     getComponent: [StringTextComponent] foo 
+#   82|     getComponent: [StringInterpolationComponent] #{...}
+#   82|       getStmt: [LocalVariableAccess] bar
+#   83|   getStmt: [StringLiteral] "foo #{...}"
+#   83|     getComponent: [StringTextComponent] foo 
+#   83|     getComponent: [StringInterpolationComponent] #{...}
+#   83|       getStmt: [ConstantReadAccess] BAR
+#   86|   getStmt: [CharacterLiteral] ?x
+#   87|   getStmt: [CharacterLiteral] ?\n
+#   88|   getStmt: [CharacterLiteral] ?\s
+#   89|   getStmt: [CharacterLiteral] ?\\
+#   90|   getStmt: [CharacterLiteral] ?\u{58}
+#   91|   getStmt: [CharacterLiteral] ?\C-a
+#   92|   getStmt: [CharacterLiteral] ?\M-a
+#   93|   getStmt: [CharacterLiteral] ?\M-\C-a
+#   94|   getStmt: [CharacterLiteral] ?\C-\M-a
+#   97|   getStmt: [SymbolLiteral] :""
+#   98|   getStmt: [SymbolLiteral] :hello
+#   99|   getStmt: [SymbolLiteral] :"foo bar"
+#   99|     getComponent: [StringTextComponent] foo bar
+#  100|   getStmt: [SymbolLiteral] :"bar baz"
+#  100|     getComponent: [StringTextComponent] bar baz
+#  101|   getStmt: [HashLiteral] {...}
+#  101|     getElement: [Pair] Pair
+#  101|       getKey: [SymbolLiteral] :foo
+#  101|       getValue: [StringLiteral] "bar"
+#  101|         getComponent: [StringTextComponent] bar
+#  102|   getStmt: [SymbolLiteral] :"wibble"
+#  102|     getComponent: [StringTextComponent] wibble
+#  103|   getStmt: [SymbolLiteral] :"wibble wobble"
+#  103|     getComponent: [StringTextComponent] wibble wobble
+#  104|   getStmt: [SymbolLiteral] :"foo_#{...}_#{...}_#{...}"
+#  104|     getComponent: [StringTextComponent] foo_
+#  104|     getComponent: [StringInterpolationComponent] #{...}
+#  104|       getStmt: [AddExpr] ... + ...
+#  104|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
+#  104|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
+#  104|     getComponent: [StringTextComponent] _
+#  104|     getComponent: [StringInterpolationComponent] #{...}
+#  104|       getStmt: [LocalVariableAccess] bar
+#  104|     getComponent: [StringTextComponent] _
+#  104|     getComponent: [StringInterpolationComponent] #{...}
+#  104|       getStmt: [ConstantReadAccess] BAR
+#  105|   getStmt: [SymbolLiteral] :"foo_#{ 2 + 2}_#{bar}_#{BAR}"
+#  105|     getComponent: [StringTextComponent] foo_#{ 2 + 2}_#{bar}_#{BAR}
+#  106|   getStmt: [SymbolLiteral] :"foo_#{ 3 - 2 }"
+#  106|     getComponent: [StringTextComponent] foo_#{ 3 - 2 }
+#  109|   getStmt: [ArrayLiteral] [...]
+#  110|   getStmt: [ArrayLiteral] [...]
+#  110|     getElement: [IntegerLiteral] 1
+#  110|     getElement: [IntegerLiteral] 2
+#  110|     getElement: [IntegerLiteral] 3
+#  111|   getStmt: [ArrayLiteral] [...]
+#  111|     getElement: [IntegerLiteral] 4
+#  111|     getElement: [IntegerLiteral] 5
+#  111|     getElement: [DivExpr] ... / ...
+#  111|       getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 12
+#  111|       getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
+#  112|   getStmt: [ArrayLiteral] [...]
+#  112|     getElement: [IntegerLiteral] 7
+#  112|     getElement: [ArrayLiteral] [...]
+#  112|       getElement: [IntegerLiteral] 8
+#  112|       getElement: [IntegerLiteral] 9
+#  115|   getStmt: [ArrayLiteral] %w(...)
+#  116|   getStmt: [ArrayLiteral] %w(...)
+#  116|     getElement: [StringLiteral] "foo"
+#  116|       getComponent: [StringTextComponent] foo
+#  116|     getElement: [StringLiteral] "bar"
+#  116|       getComponent: [StringTextComponent] bar
+#  116|     getElement: [StringLiteral] "baz"
+#  116|       getComponent: [StringTextComponent] baz
+#  117|   getStmt: [ArrayLiteral] %w(...)
+#  117|     getElement: [StringLiteral] "foo"
+#  117|       getComponent: [StringTextComponent] foo
+#  117|     getElement: [StringLiteral] "bar"
+#  117|       getComponent: [StringTextComponent] bar
+#  117|     getElement: [StringLiteral] "baz"
+#  117|       getComponent: [StringTextComponent] baz
+#  118|   getStmt: [ArrayLiteral] %w(...)
+#  118|     getElement: [StringLiteral] "foo"
+#  118|       getComponent: [StringTextComponent] foo
+#  118|     getElement: [StringLiteral] "bar#{...}"
+#  118|       getComponent: [StringTextComponent] bar
+#  118|       getComponent: [StringInterpolationComponent] #{...}
+#  118|         getStmt: [AddExpr] ... + ...
+#  118|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#  118|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  118|     getElement: [StringLiteral] "#{...}"
+#  118|       getComponent: [StringInterpolationComponent] #{...}
+#  118|         getStmt: [LocalVariableAccess] bar
+#  118|     getElement: [StringLiteral] "#{...}"
+#  118|       getComponent: [StringInterpolationComponent] #{...}
+#  118|         getStmt: [ConstantReadAccess] BAR
+#  118|     getElement: [StringLiteral] "baz"
+#  118|       getComponent: [StringTextComponent] baz
+#  119|   getStmt: [ArrayLiteral] %w(...)
+#  119|     getElement: [StringLiteral] "foo"
+#  119|       getComponent: [StringTextComponent] foo
+#  119|     getElement: [StringLiteral] "bar#{1+1}"
+#  119|       getComponent: [StringTextComponent] bar#{1+1}
+#  119|     getElement: [StringLiteral] "#{bar}"
+#  119|       getComponent: [StringTextComponent] #{bar}
+#  119|     getElement: [StringLiteral] "#{BAR}"
+#  119|       getComponent: [StringTextComponent] #{BAR}
+#  119|     getElement: [StringLiteral] "baz"
+#  119|       getComponent: [StringTextComponent] baz
+#  122|   getStmt: [ArrayLiteral] %i(...)
+#  123|   getStmt: [ArrayLiteral] %i(...)
+#  123|     getElement: [SymbolLiteral] :"foo"
+#  123|       getComponent: [StringTextComponent] foo
+#  123|     getElement: [SymbolLiteral] :"bar"
+#  123|       getComponent: [StringTextComponent] bar
+#  123|     getElement: [SymbolLiteral] :"baz"
+#  123|       getComponent: [StringTextComponent] baz
+#  124|   getStmt: [ArrayLiteral] %i(...)
+#  124|     getElement: [SymbolLiteral] :"foo"
+#  124|       getComponent: [StringTextComponent] foo
+#  124|     getElement: [SymbolLiteral] :"bar"
+#  124|       getComponent: [StringTextComponent] bar
+#  124|     getElement: [SymbolLiteral] :"baz"
+#  124|       getComponent: [StringTextComponent] baz
+#  125|   getStmt: [ArrayLiteral] %i(...)
+#  125|     getElement: [SymbolLiteral] :"foo"
+#  125|       getComponent: [StringTextComponent] foo
+#  125|     getElement: [SymbolLiteral] :"bar#{...}"
+#  125|       getComponent: [StringTextComponent] bar
+#  125|       getComponent: [StringInterpolationComponent] #{...}
+#  125|         getStmt: [AddExpr] ... + ...
+#  125|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
+#  125|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
+#  125|     getElement: [SymbolLiteral] :"#{...}"
+#  125|       getComponent: [StringInterpolationComponent] #{...}
+#  125|         getStmt: [LocalVariableAccess] bar
+#  125|     getElement: [SymbolLiteral] :"#{...}"
+#  125|       getComponent: [StringInterpolationComponent] #{...}
+#  125|         getStmt: [ConstantReadAccess] BAR
+#  125|     getElement: [SymbolLiteral] :"baz"
+#  125|       getComponent: [StringTextComponent] baz
+#  126|   getStmt: [ArrayLiteral] %i(...)
+#  126|     getElement: [SymbolLiteral] :"foo"
+#  126|       getComponent: [StringTextComponent] foo
+#  126|     getElement: [SymbolLiteral] :"bar#{"
+#  126|       getComponent: [StringTextComponent] bar#{
+#  126|     getElement: [SymbolLiteral] :"2"
+#  126|       getComponent: [StringTextComponent] 2
+#  126|     getElement: [SymbolLiteral] :"+"
+#  126|       getComponent: [StringTextComponent] +
+#  126|     getElement: [SymbolLiteral] :"4"
+#  126|       getComponent: [StringTextComponent] 4
+#  126|     getElement: [SymbolLiteral] :"}"
+#  126|       getComponent: [StringTextComponent] }
+#  126|     getElement: [SymbolLiteral] :"#{bar}"
+#  126|       getComponent: [StringTextComponent] #{bar}
+#  126|     getElement: [SymbolLiteral] :"#{BAR}"
+#  126|       getComponent: [StringTextComponent] #{BAR}
+#  126|     getElement: [SymbolLiteral] :"baz"
+#  126|       getComponent: [StringTextComponent] baz
+#  129|   getStmt: [HashLiteral] {...}
+#  130|   getStmt: [HashLiteral] {...}
+#  130|     getElement: [Pair] Pair
+#  130|       getKey: [SymbolLiteral] :foo
+#  130|       getValue: [IntegerLiteral] 1
+#  130|     getElement: [Pair] Pair
+#  130|       getKey: [SymbolLiteral] :bar
+#  130|       getValue: [IntegerLiteral] 2
+#  130|     getElement: [Pair] Pair
+#  130|       getKey: [StringLiteral] "baz"
+#  130|         getComponent: [StringTextComponent] baz
+#  130|       getValue: [IntegerLiteral] 3
+#  131|   getStmt: [HashLiteral] {...}
+#  131|     getElement: [Pair] Pair
+#  131|       getKey: [SymbolLiteral] :foo
+#  131|       getValue: [IntegerLiteral] 7
+#  131|     getElement: [HashSplatExpr] ** ...
+#  131|       getAnOperand/getOperand/getReceiver: [MethodCall] call to baz
+#  131|         getReceiver: [SelfVariableAccess] self
+#  134|   getStmt: [ParenthesizedExpr] ( ... )
+#  134|     getStmt: [RangeLiteral] _ .. _
+#  134|       getBegin: [IntegerLiteral] 1
+#  134|       getEnd: [IntegerLiteral] 10
+#  135|   getStmt: [ParenthesizedExpr] ( ... )
+#  135|     getStmt: [RangeLiteral] _ ... _
+#  135|       getBegin: [IntegerLiteral] 1
+#  135|       getEnd: [IntegerLiteral] 10
+#  136|   getStmt: [ParenthesizedExpr] ( ... )
+#  136|     getStmt: [RangeLiteral] _ .. _
+#  136|       getBegin: [IntegerLiteral] 1
+#  136|       getEnd: [IntegerLiteral] 0
+#  137|   getStmt: [ParenthesizedExpr] ( ... )
+#  137|     getStmt: [RangeLiteral] _ .. _
+#  137|       getBegin: [MethodCall] call to start
+#  137|         getReceiver: [SelfVariableAccess] self
+#  137|       getEnd: [AddExpr] ... + ...
+#  137|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
+#  137|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 3
+#  138|   getStmt: [ParenthesizedExpr] ( ... )
+#  138|     getStmt: [RangeLiteral] _ .. _
+#  138|       getBegin: [IntegerLiteral] 1
+#  139|   getStmt: [ParenthesizedExpr] ( ... )
+#  139|     getStmt: [RangeLiteral] _ .. _
+#  139|       getEnd: [IntegerLiteral] 1
+#  140|   getStmt: [ParenthesizedExpr] ( ... )
+#  140|     getStmt: [SubExpr] ... - ...
+#  140|       getAnOperand/getLeftOperand/getReceiver: [RangeLiteral] _ .. _
+#  140|         getBegin: [IntegerLiteral] 0
+#  140|       getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  143|   getStmt: [SubshellLiteral] `ls -l`
+#  143|     getComponent: [StringTextComponent] ls -l
+#  144|   getStmt: [SubshellLiteral] `ls -l`
+#  144|     getComponent: [StringTextComponent] ls -l
+#  145|   getStmt: [SubshellLiteral] `du -d #{...} #{...} #{...}`
+#  145|     getComponent: [StringTextComponent] du -d 
+#  145|     getComponent: [StringInterpolationComponent] #{...}
+#  145|       getStmt: [AddExpr] ... + ...
+#  145|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#  145|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  145|     getComponent: [StringTextComponent]  
+#  145|     getComponent: [StringInterpolationComponent] #{...}
+#  145|       getStmt: [LocalVariableAccess] bar
+#  145|     getComponent: [StringTextComponent]  
+#  145|     getComponent: [StringInterpolationComponent] #{...}
+#  145|       getStmt: [ConstantReadAccess] BAR
+#  146|   getStmt: [SubshellLiteral] `du -d #{...}`
+#  146|     getComponent: [StringTextComponent] du -d 
+#  146|     getComponent: [StringInterpolationComponent] #{...}
+#  146|       getStmt: [SubExpr] ... - ...
+#  146|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 5
+#  146|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
+#  149|   getStmt: [RegExpLiteral] //
+#  150|   getStmt: [RegExpLiteral] /foo/
+#  150|     getParsed: [RegExpConstant, RegExpNormalChar] foo
+#  150|     getComponent: [RegExpTextComponent] foo
+#  151|   getStmt: [RegExpLiteral] /foo/
+#  151|     getParsed: [RegExpConstant, RegExpNormalChar] foo
+#  151|     getComponent: [RegExpTextComponent] foo
+#  152|   getStmt: [RegExpLiteral] /foo+\sbar\S/
+#  152|     getParsed: [RegExpSequence] foo+\sbar\S
+#  152|       0: [RegExpConstant, RegExpNormalChar] fo
+#  152|       1: [RegExpPlus] o+
+#  152|         0: [RegExpConstant, RegExpNormalChar] o
+#  152|       2: [RegExpCharacterClassEscape] \s
+#  152|       3: [RegExpConstant, RegExpNormalChar] bar
+#  152|       4: [RegExpCharacterClassEscape] \S
+#  152|     getComponent: [RegExpTextComponent] foo+
+#  152|     getComponent: [RegExpEscapeSequenceComponent] \s
+#  152|     getComponent: [RegExpTextComponent] bar
+#  152|     getComponent: [RegExpEscapeSequenceComponent] \S
+#  153|   getStmt: [RegExpLiteral] /foo#{...}bar#{...}#{...}/
+#  153|     getParsed: [RegExpConstant, RegExpNormalChar] foo2barbarbar
+#  153|     getComponent: [RegExpTextComponent] foo
+#  153|     getComponent: [RegExpInterpolationComponent] #{...}
+#  153|       getStmt: [AddExpr] ... + ...
+#  153|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#  153|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  153|     getComponent: [RegExpTextComponent] bar
+#  153|     getComponent: [RegExpInterpolationComponent] #{...}
+#  153|       getStmt: [LocalVariableAccess] bar
+#  153|     getComponent: [RegExpInterpolationComponent] #{...}
+#  153|       getStmt: [ConstantReadAccess] BAR
+#  154|   getStmt: [RegExpLiteral] /foo/
+#  154|     getComponent: [RegExpTextComponent] foo
+#  155|   getStmt: [RegExpLiteral] //
+#  156|   getStmt: [RegExpLiteral] /foo/
+#  156|     getParsed: [RegExpConstant, RegExpNormalChar] foo
+#  156|     getComponent: [RegExpTextComponent] foo
+#  157|   getStmt: [RegExpLiteral] /foo/
+#  157|     getParsed: [RegExpConstant, RegExpNormalChar] foo
+#  157|     getComponent: [RegExpTextComponent] foo
+#  158|   getStmt: [RegExpLiteral] /foo+\sbar\S/
+#  158|     getParsed: [RegExpSequence] foo+\sbar\S
+#  158|       0: [RegExpConstant, RegExpNormalChar] fo
+#  158|       1: [RegExpPlus] o+
+#  158|         0: [RegExpConstant, RegExpNormalChar] o
+#  158|       2: [RegExpCharacterClassEscape] \s
+#  158|       3: [RegExpConstant, RegExpNormalChar] bar
+#  158|       4: [RegExpCharacterClassEscape] \S
+#  158|     getComponent: [RegExpTextComponent] foo+
+#  158|     getComponent: [RegExpEscapeSequenceComponent] \s
+#  158|     getComponent: [RegExpTextComponent] bar
+#  158|     getComponent: [RegExpEscapeSequenceComponent] \S
+#  159|   getStmt: [RegExpLiteral] /foo#{...}bar#{...}#{...}/
+#  159|     getParsed: [RegExpConstant, RegExpNormalChar] foo2barbarbar
+#  159|     getComponent: [RegExpTextComponent] foo
+#  159|     getComponent: [RegExpInterpolationComponent] #{...}
+#  159|       getStmt: [AddExpr] ... + ...
+#  159|         getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#  159|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  159|     getComponent: [RegExpTextComponent] bar
+#  159|     getComponent: [RegExpInterpolationComponent] #{...}
+#  159|       getStmt: [LocalVariableAccess] bar
+#  159|     getComponent: [RegExpInterpolationComponent] #{...}
+#  159|       getStmt: [ConstantReadAccess] BAR
+#  160|   getStmt: [RegExpLiteral] /foo/
+#  160|     getComponent: [RegExpTextComponent] foo
+#  163|   getStmt: [StringLiteral] "abcdefghijklmnopqrstuvwxyzabcdef"
+#  163|     getComponent: [StringTextComponent] abcdefghijklmnopqrstuvwxyzabcdef
+#  164|   getStmt: [StringLiteral] "foobarfoobarfoobarfoobarfooba..."
+#  164|     getComponent: [StringTextComponent] foobarfoobarfoobarfoobarfoobarfoo
+#  165|   getStmt: [StringLiteral] "foobar\\foobar\\foobar\\fooba..."
+#  165|     getComponent: [StringTextComponent] foobar
+#  165|     getComponent: [StringEscapeSequenceComponent] \\
+#  165|     getComponent: [StringTextComponent] foobar
+#  165|     getComponent: [StringEscapeSequenceComponent] \\
+#  165|     getComponent: [StringTextComponent] foobar
+#  165|     getComponent: [StringEscapeSequenceComponent] \\
+#  165|     getComponent: [StringTextComponent] foobar
+#  165|     getComponent: [StringEscapeSequenceComponent] \\
+#  165|     getComponent: [StringTextComponent] foobar
+#  168|   getStmt: [MethodCall] call to run_sql
+#  168|     getReceiver: [SelfVariableAccess] self
+#  168|     getArgument: [HereDoc] <<SQL
+#  168|       getComponent: [StringTextComponent] 
+#  168|       select * from table
+#  168|       
+#  168|     getArgument: [HereDoc] <<SQL
+#  170|       getComponent: [StringTextComponent] 
+#  170|       where name = 
+#  171|       getComponent: [StringInterpolationComponent] #{...}
+#  171|         getStmt: [MethodCall] call to name
+#  171|           getReceiver: [SelfVariableAccess] self
 #  171|       getComponent: [StringTextComponent] 
-#  171|        text with 
-#  172|       getComponent: [StringInterpolationComponent] #{...}
-#  172|         getStmt: [MethodCall] call to interpolation
-#  172|           getReceiver: [Self, SelfVariableAccess] self
-#  172|       getComponent: [StringTextComponent]  !
-#  172|       
-#  176|   getStmt: [AssignExpr] ... = ...
-#  176|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
-#  176|     getAnOperand/getRightOperand: [HereDoc] <<'DOC'
-#  176|       getComponent: [StringTextComponent] 
-#  176|        text without 
-#  177|       getComponent: [StringInterpolationComponent] #{...}
-#  177|         getStmt: [MethodCall] call to interpolation
-#  177|           getReceiver: [Self, SelfVariableAccess] self
-#  177|       getComponent: [StringTextComponent]  !
-#  177|       
+#  171|       
+#  174|   getStmt: [Method] m
+#  175|     getStmt: [AssignExpr] ... = ...
+#  175|       getAnOperand/getLeftOperand: [LocalVariableAccess] query
+#  175|       getAnOperand/getRightOperand: [HereDoc] <<-BLA
+#  175|         getComponent: [StringTextComponent] 
+#  175|         some text
+#  176|         getComponent: [StringEscapeSequenceComponent] \n
+#  176|         getComponent: [StringTextComponent] and some more
+#  176|           
 #  180|   getStmt: [AssignExpr] ... = ...
-#  180|     getAnOperand/getLeftOperand: [LocalVariableAccess] output
-#  180|     getAnOperand/getRightOperand: [HereDoc] <<`SCRIPT`
+#  180|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
+#  180|     getAnOperand/getRightOperand: [HereDoc] <<~SQUIGGLY
 #  180|       getComponent: [StringTextComponent] 
-#  180|        cat file.txt
+#  180|          indented stuff
 #  180|       
 #  184|   getStmt: [AssignExpr] ... = ...
-#  184|     getAnOperand/getLeftOperand: [LocalVariableAccess] x
-#  184|     getAnOperand/getRightOperand: [IntegerLiteral] 42
-#  185|   getStmt: [HashLiteral] {...}
-#  185|     getElement: [Pair] Pair
-#  185|       getKey: [SymbolLiteral] :x
-#  185|       getValue: [LocalVariableAccess] x
-#  185|     getElement: [Pair] Pair
-#  185|       getKey: [SymbolLiteral] :y
-#  185|       getValue: [IntegerLiteral] 5
-#  186|   getStmt: [HashLiteral] {...}
-#  186|     getElement: [Pair] Pair
-#  186|       getKey: [SymbolLiteral] :y
-#  186|       getValue: [MethodCall] call to y
-#  186|     getElement: [Pair] Pair
-#  186|       getKey: [SymbolLiteral] :Z
-#  186|       getValue: [ConstantReadAccess] Z
+#  184|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
+#  184|     getAnOperand/getRightOperand: [HereDoc] <<"DOC"
+#  184|       getComponent: [StringTextComponent] 
+#  184|        text with 
+#  185|       getComponent: [StringInterpolationComponent] #{...}
+#  185|         getStmt: [MethodCall] call to interpolation
+#  185|           getReceiver: [SelfVariableAccess] self
+#  185|       getComponent: [StringTextComponent]  !
+#  185|       
+#  189|   getStmt: [AssignExpr] ... = ...
+#  189|     getAnOperand/getLeftOperand: [LocalVariableAccess] query
+#  189|     getAnOperand/getRightOperand: [HereDoc] <<'DOC'
+#  189|       getComponent: [StringTextComponent] 
+#  189|        text without 
+#  190|       getComponent: [StringInterpolationComponent] #{...}
+#  190|         getStmt: [MethodCall] call to interpolation
+#  190|           getReceiver: [SelfVariableAccess] self
+#  190|       getComponent: [StringTextComponent]  !
+#  190|       
+#  193|   getStmt: [AssignExpr] ... = ...
+#  193|     getAnOperand/getLeftOperand: [LocalVariableAccess] output
+#  193|     getAnOperand/getRightOperand: [HereDoc] <<`SCRIPT`
+#  193|       getComponent: [StringTextComponent] 
+#  193|        cat file.txt
+#  193|       
+#  197|   getStmt: [AssignExpr] ... = ...
+#  197|     getAnOperand/getLeftOperand: [LocalVariableAccess] x
+#  197|     getAnOperand/getRightOperand: [IntegerLiteral] 42
+#  198|   getStmt: [HashLiteral] {...}
+#  198|     getElement: [Pair] Pair
+#  198|       getKey: [SymbolLiteral] :x
+#  198|       getValue: [LocalVariableAccess] x
+#  198|     getElement: [Pair] Pair
+#  198|       getKey: [SymbolLiteral] :y
+#  198|       getValue: [IntegerLiteral] 5
+#  199|   getStmt: [HashLiteral] {...}
+#  199|     getElement: [Pair] Pair
+#  199|       getKey: [SymbolLiteral] :y
+#  199|       getValue: [MethodCall] call to y
+#  199|     getElement: [Pair] Pair
+#  199|       getKey: [SymbolLiteral] :Z
+#  199|       getValue: [ConstantReadAccess] Z
 control/loops.rb:
 #    1| [Toplevel] loops.rb
 #    2|   getStmt: [AssignExpr] ... = ...
@@ -2116,7 +2306,7 @@ control/loops.rb:
 misc/misc.erb:
 #    2| [Toplevel] misc.erb
 #    2|   getStmt: [MethodCall] call to require_asset
-#    2|     getReceiver: [Self, SelfVariableAccess] self
+#    2|     getReceiver: [SelfVariableAccess] self
 #    2|     getArgument: [StringLiteral] "main_include_admin.js"
 #    2|       getComponent: [StringTextComponent] main_include_admin.js
 misc/misc.rb:
@@ -2166,7 +2356,7 @@ modules/modules.rb:
 #    6|       getStmt: [ClassDeclaration] ClassInFooBar
 #    9|       getStmt: [Method] method_in_foo_bar
 #   12|       getStmt: [MethodCall] call to puts
-#   12|         getReceiver: [Self, SelfVariableAccess] self
+#   12|         getReceiver: [SelfVariableAccess] self
 #   12|         getArgument: [StringLiteral] "module Foo::Bar"
 #   12|           getComponent: [StringTextComponent] module Foo::Bar
 #   13|       getStmt: [AssignExpr] ... = ...
@@ -2175,7 +2365,7 @@ modules/modules.rb:
 #   16|     getStmt: [Method] method_in_foo
 #   19|     getStmt: [ClassDeclaration] ClassInFoo
 #   22|     getStmt: [MethodCall] call to puts
-#   22|       getReceiver: [Self, SelfVariableAccess] self
+#   22|       getReceiver: [SelfVariableAccess] self
 #   22|       getArgument: [StringLiteral] "module Foo"
 #   22|         getComponent: [StringTextComponent] module Foo
 #   23|     getStmt: [AssignExpr] ... = ...
@@ -2185,7 +2375,7 @@ modules/modules.rb:
 #   27|     getStmt: [Method] method_in_another_definition_of_foo
 #   30|     getStmt: [ClassDeclaration] ClassInAnotherDefinitionOfFoo
 #   33|     getStmt: [MethodCall] call to puts
-#   33|       getReceiver: [Self, SelfVariableAccess] self
+#   33|       getReceiver: [SelfVariableAccess] self
 #   33|       getArgument: [StringLiteral] "module Foo again"
 #   33|         getComponent: [StringTextComponent] module Foo again
 #   34|     getStmt: [AssignExpr] ... = ...
@@ -2195,7 +2385,7 @@ modules/modules.rb:
 #   38|     getStmt: [Method] method_a
 #   41|     getStmt: [Method] method_b
 #   44|     getStmt: [MethodCall] call to puts
-#   44|       getReceiver: [Self, SelfVariableAccess] self
+#   44|       getReceiver: [SelfVariableAccess] self
 #   44|       getArgument: [StringLiteral] "module Bar"
 #   44|         getComponent: [StringTextComponent] module Bar
 #   45|     getStmt: [AssignExpr] ... = ...
@@ -2206,7 +2396,7 @@ modules/modules.rb:
 #   49|     getStmt: [ClassDeclaration] ClassInAnotherDefinitionOfFooBar
 #   52|     getStmt: [Method] method_in_another_definition_of_foo_bar
 #   55|     getStmt: [MethodCall] call to puts
-#   55|       getReceiver: [Self, SelfVariableAccess] self
+#   55|       getReceiver: [SelfVariableAccess] self
 #   55|       getArgument: [StringLiteral] "module Foo::Bar again"
 #   55|         getComponent: [StringTextComponent] module Foo::Bar again
 #   56|     getStmt: [AssignExpr] ... = ...
@@ -2231,25 +2421,25 @@ modules/modules.rb:
 #   84|     getStmt: [ModuleDeclaration] Foo1
 #   88|   getStmt: [ModuleDeclaration] IncludeTest
 #   89|     getStmt: [MethodCall] call to include
-#   89|       getReceiver: [Self, SelfVariableAccess] self
+#   89|       getReceiver: [SelfVariableAccess] self
 #   89|       getArgument: [ConstantReadAccess] Test
 #   90|     getStmt: [MethodCall] call to module_eval
 #   90|       getReceiver: [ConstantReadAccess] Object
 #   90|       getBlock: [BraceBlock] { ... }
 #   90|         getStmt: [MethodCall] call to prepend
-#   90|           getReceiver: [Self, SelfVariableAccess] self
+#   90|           getReceiver: [SelfVariableAccess] self
 #   90|           getArgument: [ConstantReadAccess] Other
 #   91|     getStmt: [ModuleDeclaration] Y
 #   91|       getScopeExpr: [ConstantReadAccess] Foo1
 #   95|   getStmt: [ModuleDeclaration] IncludeTest2
 #   96|     getStmt: [MethodCall] call to include
-#   96|       getReceiver: [Self, SelfVariableAccess] self
+#   96|       getReceiver: [SelfVariableAccess] self
 #   96|       getArgument: [ConstantReadAccess] Test
 #   97|     getStmt: [ModuleDeclaration] Z
 #   97|       getScopeExpr: [ConstantReadAccess] Foo1
 #  101|   getStmt: [ModuleDeclaration] PrependTest
 #  102|     getStmt: [MethodCall] call to prepend
-#  102|       getReceiver: [Self, SelfVariableAccess] self
+#  102|       getReceiver: [SelfVariableAccess] self
 #  102|       getArgument: [ConstantReadAccess] Test
 #  103|     getStmt: [ModuleDeclaration] Y
 #  103|       getScopeExpr: [ConstantReadAccess] Foo2
@@ -2513,7 +2703,7 @@ params/params.rb:
 #    9|       getParameter: [SimpleParameter] value
 #    9|         getDefiningAccess: [LocalVariableAccess] value
 #   10|       getStmt: [MethodCall] call to puts
-#   10|         getReceiver: [Self, SelfVariableAccess] self
+#   10|         getReceiver: [SelfVariableAccess] self
 #   10|         getArgument: [StringLiteral] "#{...} -> #{...}"
 #   10|           getComponent: [StringInterpolationComponent] #{...}
 #   10|             getStmt: [LocalVariableAccess] key
@@ -2545,7 +2735,7 @@ params/params.rb:
 #   22|         getElement: [LocalVariableAccess] a
 #   22|         getElement: [LocalVariableAccess] b
 #   22|       getStmt: [MethodCall] call to puts
-#   22|         getReceiver: [Self, SelfVariableAccess] self
+#   22|         getReceiver: [SelfVariableAccess] self
 #   22|         getArgument: [AddExpr] ... + ...
 #   22|           getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] a
 #   22|           getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] b
@@ -2607,7 +2797,7 @@ params/params.rb:
 #   46|     getParameter: [BlockParameter] &block
 #   46|       getDefiningAccess: [LocalVariableAccess] block
 #   47|     getStmt: [MethodCall] call to puts
-#   47|       getReceiver: [Self, SelfVariableAccess] self
+#   47|       getReceiver: [SelfVariableAccess] self
 #   47|       getArgument: [MethodCall] call to call
 #   47|         getReceiver: [LocalVariableAccess] block
 #   47|         getArgument: [Pair] Pair
@@ -2617,7 +2807,7 @@ params/params.rb:
 #   47|           getKey: [SymbolLiteral] :foo
 #   47|           getValue: [IntegerLiteral] 3
 #   49|   getStmt: [MethodCall] call to use_block_with_keyword
-#   49|     getReceiver: [Self, SelfVariableAccess] self
+#   49|     getReceiver: [SelfVariableAccess] self
 #   49|     getBlock: [DoBlock] do ... end
 #   49|       getParameter: [KeywordParameter] xx
 #   49|         getDefiningAccess: [LocalVariableAccess] xx
@@ -2659,7 +2849,7 @@ params/params.rb:
 #   63|       getArgument: [StringLiteral] "Zeus"
 #   63|         getComponent: [StringTextComponent] Zeus
 #   65|   getStmt: [MethodCall] call to use_block_with_optional
-#   65|     getReceiver: [Self, SelfVariableAccess] self
+#   65|     getReceiver: [SelfVariableAccess] self
 #   65|     getBlock: [DoBlock] do ... end
 #   65|       getParameter: [SimpleParameter] name
 #   65|         getDefiningAccess: [LocalVariableAccess] name
@@ -2667,7 +2857,7 @@ params/params.rb:
 #   65|         getDefiningAccess: [LocalVariableAccess] age
 #   65|         getDefaultValue: [IntegerLiteral] 99
 #   66|       getStmt: [MethodCall] call to puts
-#   66|         getReceiver: [Self, SelfVariableAccess] self
+#   66|         getReceiver: [SelfVariableAccess] self
 #   66|         getArgument: [StringLiteral] "#{...} is #{...} years old"
 #   66|           getComponent: [StringInterpolationComponent] #{...}
 #   66|             getStmt: [LocalVariableAccess] name
@@ -2707,7 +2897,7 @@ params/params.rb:
 #   81|     getParameter: [BlockParameter] &
 #   81|       getDefiningAccess: [LocalVariableAccess] __synth__0
 #   82|     getStmt: [MethodCall] call to proc
-#   82|       getReceiver: [Self, SelfVariableAccess] self
+#   82|       getReceiver: [SelfVariableAccess] self
 #   82|       getArgument: [BlockArgument] &...
 #   82|         getValue: [LocalVariableAccess] __synth__0
 #   83|     getStmt: [MethodCall] call to each
@@ -2789,24 +2979,24 @@ gems/lib/test.rb:
 #    1| [Toplevel] test.rb
 #    1|   getStmt: [ClassDeclaration] Foo
 #    2|     getStmt: [SingletonMethod] greet
-#    2|       getObject: [Self, SelfVariableAccess] self
+#    2|       getObject: [SelfVariableAccess] self
 #    3|       getStmt: [MethodCall] call to puts
-#    3|         getReceiver: [Self, SelfVariableAccess] self
+#    3|         getReceiver: [SelfVariableAccess] self
 #    3|         getArgument: [StringLiteral] "Hello"
 #    3|           getComponent: [StringTextComponent] Hello
 modules/toplevel.rb:
 #    1| [Toplevel] toplevel.rb
 #    1|   getStmt: [MethodCall] call to puts
-#    1|     getReceiver: [Self, SelfVariableAccess] self
+#    1|     getReceiver: [SelfVariableAccess] self
 #    1|     getArgument: [StringLiteral] "world"
 #    1|       getComponent: [StringTextComponent] world
 #    3|   getStmt: [EndBlock] END { ... }
 #    3|     getStmt: [MethodCall] call to puts
-#    3|       getReceiver: [Self, SelfVariableAccess] self
+#    3|       getReceiver: [SelfVariableAccess] self
 #    3|       getArgument: [StringLiteral] "!!!"
 #    3|         getComponent: [StringTextComponent] !!!
 #    5|   getBeginBlock: [BeginBlock] BEGIN { ... }
 #    5|     getStmt: [MethodCall] call to puts
-#    5|       getReceiver: [Self, SelfVariableAccess] self
+#    5|       getReceiver: [SelfVariableAccess] self
 #    5|       getArgument: [StringLiteral] "hello"
 #    5|         getComponent: [StringTextComponent] hello
diff --git a/ruby/ql/test/library-tests/ast/AstDesugar.expected b/ruby/ql/test/library-tests/ast/AstDesugar.expected
index aafae61dbfe..9d6a7e6ddf6 100644
--- a/ruby/ql/test/library-tests/ast/AstDesugar.expected
+++ b/ruby/ql/test/library-tests/ast/AstDesugar.expected
@@ -3,7 +3,7 @@ calls/calls.rb:
 #   58|   getDesugared: [MethodCall] call to []
 #   58|     getReceiver: [ConstantReadAccess] Array
 #   58|     getArgument: [MethodCall] call to foo
-#   58|       getReceiver: [Self, SelfVariableAccess] self
+#   58|       getReceiver: [SelfVariableAccess] self
 #   59| [ArrayLiteral] [...]
 #   59|   getDesugared: [MethodCall] call to []
 #   59|     getReceiver: [ConstantReadAccess] Array
@@ -15,7 +15,7 @@ calls/calls.rb:
 #   66|     getAnOperand/getRightOperand: [AddExpr] ... + ...
 #   66|       getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] var1
 #   66|       getAnOperand/getArgument/getRightOperand: [MethodCall] call to bar
-#   66|         getReceiver: [Self, SelfVariableAccess] self
+#   66|         getReceiver: [SelfVariableAccess] self
 #   67| [AssignAddExpr] ... += ...
 #   67|   getDesugared: [AssignExpr] ... = ...
 #   67|     getAnOperand/getLeftOperand: [LocalVariableAccess] var1
@@ -32,9 +32,9 @@ calls/calls.rb:
 #  226|         getAnOperand/getRightOperand: [LocalVariableAccess] __synth__0__1
 #  226|         getAnOperand/getLeftOperand: [LocalVariableAccess] x
 #  227|       getStmt: [MethodCall] call to baz
-#  227|         getReceiver: [Self, SelfVariableAccess] self
+#  227|         getReceiver: [SelfVariableAccess] self
 #  226|     getReceiver: [MethodCall] call to bar
-#  226|       getReceiver: [Self, SelfVariableAccess] self
+#  226|       getReceiver: [SelfVariableAccess] self
 #  229| [ForExpr] for ... in ...
 #  229|   getDesugared: [MethodCall] call to each
 #  229|     getBlock: [BraceBlock] { ... }
@@ -52,9 +52,9 @@ calls/calls.rb:
 #  249|     getReceiver: [ConstantReadAccess] Hash
 #  249|     getArgument: [Pair] Pair
 #  249|       getKey: [MethodCall] call to foo
-#  249|         getReceiver: [Self, SelfVariableAccess] self
+#  249|         getReceiver: [SelfVariableAccess] self
 #  249|       getValue: [MethodCall] call to bar
-#  249|         getReceiver: [Self, SelfVariableAccess] self
+#  249|         getReceiver: [SelfVariableAccess] self
 #  249|     getArgument: [Pair] Pair
 #  249|       getKey: [MethodCall] call to foo
 #  249|         getReceiver: [ConstantReadAccess] X
@@ -63,7 +63,7 @@ calls/calls.rb:
 #  314| [AssignExpr] ... = ...
 #  314|   getDesugared: [StmtSequence] ...
 #  314|     getStmt: [SetterMethodCall] call to foo=
-#  314|       getReceiver: [Self, SelfVariableAccess] self
+#  314|       getReceiver: [SelfVariableAccess] self
 #  314|       getArgument: [AssignExpr] ... = ...
 #  314|         getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
 #  314|         getAnOperand/getRightOperand: [IntegerLiteral] 10
@@ -72,7 +72,7 @@ calls/calls.rb:
 #  315|   getDesugared: [StmtSequence] ...
 #  315|     getStmt: [SetterMethodCall] call to []=
 #  315|       getReceiver: [MethodCall] call to foo
-#  315|         getReceiver: [Self, SelfVariableAccess] self
+#  315|         getReceiver: [SelfVariableAccess] self
 #  315|       getArgument: [AssignExpr] ... = ...
 #  315|         getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
 #  315|         getAnOperand/getRightOperand: [IntegerLiteral] 10
@@ -84,7 +84,7 @@ calls/calls.rb:
 #  316|       getAnOperand/getLeftOperand: [MethodCall] call to foo
 #  316|       getDesugared: [StmtSequence] ...
 #  316|         getStmt: [SetterMethodCall] call to foo=
-#  316|           getReceiver: [Self, SelfVariableAccess] self
+#  316|           getReceiver: [SelfVariableAccess] self
 #  316|           getArgument: [AssignExpr] ... = ...
 #  316|             getAnOperand/getRightOperand: [MethodCall] call to []
 #  316|               getArgument: [IntegerLiteral] 0
@@ -95,7 +95,7 @@ calls/calls.rb:
 #  316|       getAnOperand/getLeftOperand: [MethodCall] call to bar
 #  316|       getDesugared: [StmtSequence] ...
 #  316|         getStmt: [SetterMethodCall] call to bar=
-#  316|           getReceiver: [Self, SelfVariableAccess] self
+#  316|           getReceiver: [SelfVariableAccess] self
 #  316|           getArgument: [AssignExpr] ... = ...
 #  316|             getAnOperand/getRightOperand: [MethodCall] call to []
 #  316|               getArgument: [RangeLiteral] _ .. _
@@ -109,7 +109,7 @@ calls/calls.rb:
 #  316|       getDesugared: [StmtSequence] ...
 #  316|         getStmt: [SetterMethodCall] call to []=
 #  316|           getReceiver: [MethodCall] call to foo
-#  316|             getReceiver: [Self, SelfVariableAccess] self
+#  316|             getReceiver: [SelfVariableAccess] self
 #  316|           getArgument: [AssignExpr] ... = ...
 #  316|             getAnOperand/getRightOperand: [MethodCall] call to []
 #  316|               getArgument: [IntegerLiteral] -1
@@ -139,7 +139,7 @@ calls/calls.rb:
 #  317|       getDesugared: [StmtSequence] ...
 #  317|         getStmt: [SetterMethodCall] call to []=
 #  317|           getReceiver: [MethodCall] call to foo
-#  317|             getReceiver: [Self, SelfVariableAccess] self
+#  317|             getReceiver: [SelfVariableAccess] self
 #  317|           getArgument: [AssignExpr] ... = ...
 #  317|             getAnOperand/getRightOperand: [MethodCall] call to []
 #  317|               getArgument: [RangeLiteral] _ .. _
@@ -161,7 +161,7 @@ calls/calls.rb:
 #  318| [AssignAddExpr] ... += ...
 #  318|   getDesugared: [StmtSequence] ...
 #  318|     getStmt: [AssignExpr] ... = ...
-#  318|       getAnOperand/getRightOperand: [Self, SelfVariableAccess] self
+#  318|       getAnOperand/getRightOperand: [SelfVariableAccess] self
 #  318|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
 #  318|     getStmt: [SetterMethodCall] call to count=
 #  318|       getReceiver: [LocalVariableAccess] __synth__0
@@ -177,7 +177,7 @@ calls/calls.rb:
 #  319|   getDesugared: [StmtSequence] ...
 #  319|     getStmt: [AssignExpr] ... = ...
 #  319|       getAnOperand/getRightOperand: [MethodCall] call to foo
-#  319|         getReceiver: [Self, SelfVariableAccess] self
+#  319|         getReceiver: [SelfVariableAccess] self
 #  319|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
 #  319|     getStmt: [SetterMethodCall] call to []=
 #  319|       getReceiver: [LocalVariableAccess] __synth__0
@@ -199,7 +199,7 @@ calls/calls.rb:
 #  320|     getStmt: [AssignExpr] ... = ...
 #  320|       getAnOperand/getRightOperand: [MethodCall] call to bar
 #  320|         getReceiver: [MethodCall] call to foo
-#  320|           getReceiver: [Self, SelfVariableAccess] self
+#  320|           getReceiver: [SelfVariableAccess] self
 #  320|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
 #  320|     getStmt: [SetterMethodCall] call to []=
 #  320|       getReceiver: [LocalVariableAccess] __synth__0
@@ -213,13 +213,13 @@ calls/calls.rb:
 #  320|     getStmt: [AssignExpr] ... = ...
 #  320|       getAnOperand/getRightOperand: [MethodCall] call to baz
 #  320|         getReceiver: [MethodCall] call to foo
-#  320|           getReceiver: [Self, SelfVariableAccess] self
+#  320|           getReceiver: [SelfVariableAccess] self
 #  320|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__2
 #  320|     getStmt: [AssignExpr] ... = ...
 #  320|       getAnOperand/getRightOperand: [AddExpr] ... + ...
 #  320|         getAnOperand/getLeftOperand/getReceiver: [MethodCall] call to boo
 #  320|           getReceiver: [MethodCall] call to foo
-#  320|             getReceiver: [Self, SelfVariableAccess] self
+#  320|             getReceiver: [SelfVariableAccess] self
 #  320|         getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
 #  320|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__3
 #  320|     getStmt: [AssignExpr] ... = ...
@@ -260,7 +260,7 @@ calls/calls.rb:
 #  340|               getReceiver: [LocalVariableAccess] __synth__0__1
 #  340|         getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #  341|       getStmt: [MethodCall] call to foo
-#  341|         getReceiver: [Self, SelfVariableAccess] self
+#  341|         getReceiver: [SelfVariableAccess] self
 #  341|         getArgument: [LocalVariableAccess] x
 #  341|         getArgument: [LocalVariableAccess] y
 #  341|         getArgument: [LocalVariableAccess] z
@@ -304,197 +304,206 @@ constants/constants.rb:
 #   20|       getComponent: [StringTextComponent] Chuck
 #   20|     getArgument: [StringLiteral] "Dave"
 #   20|       getComponent: [StringTextComponent] Dave
+escape_sequences/escapes.rb:
+#   58| [ArrayLiteral] %w(...)
+#   58|   getDesugared: [MethodCall] call to []
+#   58|     getReceiver: [ConstantReadAccess] Array
+#   58|     getArgument: [StringLiteral] "foo \n"
+#   58|       getComponent: [StringTextComponent] foo
+#   58|       getComponent: [StringEscapeSequenceComponent]  \n
+#   58|     getArgument: [StringLiteral] "bar"
+#   58|       getComponent: [StringTextComponent] bar
 literals/literals.rb:
-#   88| [HashLiteral] {...}
-#   88|   getDesugared: [MethodCall] call to []
-#   88|     getReceiver: [ConstantReadAccess] Hash
-#   88|     getArgument: [Pair] Pair
-#   88|       getKey: [SymbolLiteral] :foo
-#   88|       getValue: [StringLiteral] "bar"
-#   88|         getComponent: [StringTextComponent] bar
-#   96| [ArrayLiteral] [...]
-#   96|   getDesugared: [MethodCall] call to []
-#   96|     getReceiver: [ConstantReadAccess] Array
-#   97| [ArrayLiteral] [...]
-#   97|   getDesugared: [MethodCall] call to []
-#   97|     getReceiver: [ConstantReadAccess] Array
-#   97|     getArgument: [IntegerLiteral] 1
-#   97|     getArgument: [IntegerLiteral] 2
-#   97|     getArgument: [IntegerLiteral] 3
-#   98| [ArrayLiteral] [...]
-#   98|   getDesugared: [MethodCall] call to []
-#   98|     getReceiver: [ConstantReadAccess] Array
-#   98|     getArgument: [IntegerLiteral] 4
-#   98|     getArgument: [IntegerLiteral] 5
-#   98|     getArgument: [DivExpr] ... / ...
-#   98|       getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 12
-#   98|       getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
-#   99| [ArrayLiteral] [...]
-#   99|   getDesugared: [MethodCall] call to []
-#   99|     getReceiver: [ConstantReadAccess] Array
-#   99|     getArgument: [IntegerLiteral] 7
-#   99|     getArgument: [ArrayLiteral] [...]
-#   99|       getDesugared: [MethodCall] call to []
-#   99|         getReceiver: [ConstantReadAccess] Array
-#   99|         getArgument: [IntegerLiteral] 8
-#   99|         getArgument: [IntegerLiteral] 9
-#  102| [ArrayLiteral] %w(...)
-#  102|   getDesugared: [MethodCall] call to []
-#  102|     getReceiver: [ConstantReadAccess] Array
-#  103| [ArrayLiteral] %w(...)
-#  103|   getDesugared: [MethodCall] call to []
-#  103|     getReceiver: [ConstantReadAccess] Array
-#  103|     getArgument: [StringLiteral] "foo"
-#  103|       getComponent: [StringTextComponent] foo
-#  103|     getArgument: [StringLiteral] "bar"
-#  103|       getComponent: [StringTextComponent] bar
-#  103|     getArgument: [StringLiteral] "baz"
-#  103|       getComponent: [StringTextComponent] baz
-#  104| [ArrayLiteral] %w(...)
-#  104|   getDesugared: [MethodCall] call to []
-#  104|     getReceiver: [ConstantReadAccess] Array
-#  104|     getArgument: [StringLiteral] "foo"
-#  104|       getComponent: [StringTextComponent] foo
-#  104|     getArgument: [StringLiteral] "bar"
-#  104|       getComponent: [StringTextComponent] bar
-#  104|     getArgument: [StringLiteral] "baz"
-#  104|       getComponent: [StringTextComponent] baz
-#  105| [ArrayLiteral] %w(...)
-#  105|   getDesugared: [MethodCall] call to []
-#  105|     getReceiver: [ConstantReadAccess] Array
-#  105|     getArgument: [StringLiteral] "foo"
-#  105|       getComponent: [StringTextComponent] foo
-#  105|     getArgument: [StringLiteral] "bar#{...}"
-#  105|       getComponent: [StringTextComponent] bar
-#  105|       getComponent: [StringInterpolationComponent] #{...}
-#  105|         getStmt: [AddExpr] ... + ...
-#  105|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
-#  105|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
-#  105|     getArgument: [StringLiteral] "#{...}"
-#  105|       getComponent: [StringInterpolationComponent] #{...}
-#  105|         getStmt: [LocalVariableAccess] bar
-#  105|     getArgument: [StringLiteral] "#{...}"
-#  105|       getComponent: [StringInterpolationComponent] #{...}
-#  105|         getStmt: [ConstantReadAccess] BAR
-#  105|     getArgument: [StringLiteral] "baz"
-#  105|       getComponent: [StringTextComponent] baz
-#  106| [ArrayLiteral] %w(...)
-#  106|   getDesugared: [MethodCall] call to []
-#  106|     getReceiver: [ConstantReadAccess] Array
-#  106|     getArgument: [StringLiteral] "foo"
-#  106|       getComponent: [StringTextComponent] foo
-#  106|     getArgument: [StringLiteral] "bar#{1+1}"
-#  106|       getComponent: [StringTextComponent] bar#{1+1}
-#  106|     getArgument: [StringLiteral] "#{bar}"
-#  106|       getComponent: [StringTextComponent] #{bar}
-#  106|     getArgument: [StringLiteral] "#{BAR}"
-#  106|       getComponent: [StringTextComponent] #{BAR}
-#  106|     getArgument: [StringLiteral] "baz"
-#  106|       getComponent: [StringTextComponent] baz
-#  109| [ArrayLiteral] %i(...)
+#  101| [HashLiteral] {...}
+#  101|   getDesugared: [MethodCall] call to []
+#  101|     getReceiver: [ConstantReadAccess] Hash
+#  101|     getArgument: [Pair] Pair
+#  101|       getKey: [SymbolLiteral] :foo
+#  101|       getValue: [StringLiteral] "bar"
+#  101|         getComponent: [StringTextComponent] bar
+#  109| [ArrayLiteral] [...]
 #  109|   getDesugared: [MethodCall] call to []
 #  109|     getReceiver: [ConstantReadAccess] Array
-#  110| [ArrayLiteral] %i(...)
+#  110| [ArrayLiteral] [...]
 #  110|   getDesugared: [MethodCall] call to []
 #  110|     getReceiver: [ConstantReadAccess] Array
-#  110|     getArgument: [SymbolLiteral] :"foo"
-#  110|       getComponent: [StringTextComponent] foo
-#  110|     getArgument: [SymbolLiteral] :"bar"
-#  110|       getComponent: [StringTextComponent] bar
-#  110|     getArgument: [SymbolLiteral] :"baz"
-#  110|       getComponent: [StringTextComponent] baz
-#  111| [ArrayLiteral] %i(...)
+#  110|     getArgument: [IntegerLiteral] 1
+#  110|     getArgument: [IntegerLiteral] 2
+#  110|     getArgument: [IntegerLiteral] 3
+#  111| [ArrayLiteral] [...]
 #  111|   getDesugared: [MethodCall] call to []
 #  111|     getReceiver: [ConstantReadAccess] Array
-#  111|     getArgument: [SymbolLiteral] :"foo"
-#  111|       getComponent: [StringTextComponent] foo
-#  111|     getArgument: [SymbolLiteral] :"bar"
-#  111|       getComponent: [StringTextComponent] bar
-#  111|     getArgument: [SymbolLiteral] :"baz"
-#  111|       getComponent: [StringTextComponent] baz
-#  112| [ArrayLiteral] %i(...)
+#  111|     getArgument: [IntegerLiteral] 4
+#  111|     getArgument: [IntegerLiteral] 5
+#  111|     getArgument: [DivExpr] ... / ...
+#  111|       getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 12
+#  111|       getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 2
+#  112| [ArrayLiteral] [...]
 #  112|   getDesugared: [MethodCall] call to []
 #  112|     getReceiver: [ConstantReadAccess] Array
-#  112|     getArgument: [SymbolLiteral] :"foo"
-#  112|       getComponent: [StringTextComponent] foo
-#  112|     getArgument: [SymbolLiteral] :"bar#{...}"
-#  112|       getComponent: [StringTextComponent] bar
-#  112|       getComponent: [StringInterpolationComponent] #{...}
-#  112|         getStmt: [AddExpr] ... + ...
-#  112|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
-#  112|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
-#  112|     getArgument: [SymbolLiteral] :"#{...}"
-#  112|       getComponent: [StringInterpolationComponent] #{...}
-#  112|         getStmt: [LocalVariableAccess] bar
-#  112|     getArgument: [SymbolLiteral] :"#{...}"
-#  112|       getComponent: [StringInterpolationComponent] #{...}
-#  112|         getStmt: [ConstantReadAccess] BAR
-#  112|     getArgument: [SymbolLiteral] :"baz"
-#  112|       getComponent: [StringTextComponent] baz
-#  113| [ArrayLiteral] %i(...)
-#  113|   getDesugared: [MethodCall] call to []
-#  113|     getReceiver: [ConstantReadAccess] Array
-#  113|     getArgument: [SymbolLiteral] :"foo"
-#  113|       getComponent: [StringTextComponent] foo
-#  113|     getArgument: [SymbolLiteral] :"bar#{"
-#  113|       getComponent: [StringTextComponent] bar#{
-#  113|     getArgument: [SymbolLiteral] :"2"
-#  113|       getComponent: [StringTextComponent] 2
-#  113|     getArgument: [SymbolLiteral] :"+"
-#  113|       getComponent: [StringTextComponent] +
-#  113|     getArgument: [SymbolLiteral] :"4"
-#  113|       getComponent: [StringTextComponent] 4
-#  113|     getArgument: [SymbolLiteral] :"}"
-#  113|       getComponent: [StringTextComponent] }
-#  113|     getArgument: [SymbolLiteral] :"#{bar}"
-#  113|       getComponent: [StringTextComponent] #{bar}
-#  113|     getArgument: [SymbolLiteral] :"#{BAR}"
-#  113|       getComponent: [StringTextComponent] #{BAR}
-#  113|     getArgument: [SymbolLiteral] :"baz"
-#  113|       getComponent: [StringTextComponent] baz
-#  116| [HashLiteral] {...}
+#  112|     getArgument: [IntegerLiteral] 7
+#  112|     getArgument: [ArrayLiteral] [...]
+#  112|       getDesugared: [MethodCall] call to []
+#  112|         getReceiver: [ConstantReadAccess] Array
+#  112|         getArgument: [IntegerLiteral] 8
+#  112|         getArgument: [IntegerLiteral] 9
+#  115| [ArrayLiteral] %w(...)
+#  115|   getDesugared: [MethodCall] call to []
+#  115|     getReceiver: [ConstantReadAccess] Array
+#  116| [ArrayLiteral] %w(...)
 #  116|   getDesugared: [MethodCall] call to []
-#  116|     getReceiver: [ConstantReadAccess] Hash
-#  117| [HashLiteral] {...}
+#  116|     getReceiver: [ConstantReadAccess] Array
+#  116|     getArgument: [StringLiteral] "foo"
+#  116|       getComponent: [StringTextComponent] foo
+#  116|     getArgument: [StringLiteral] "bar"
+#  116|       getComponent: [StringTextComponent] bar
+#  116|     getArgument: [StringLiteral] "baz"
+#  116|       getComponent: [StringTextComponent] baz
+#  117| [ArrayLiteral] %w(...)
 #  117|   getDesugared: [MethodCall] call to []
-#  117|     getReceiver: [ConstantReadAccess] Hash
-#  117|     getArgument: [Pair] Pair
-#  117|       getKey: [SymbolLiteral] :foo
-#  117|       getValue: [IntegerLiteral] 1
-#  117|     getArgument: [Pair] Pair
-#  117|       getKey: [SymbolLiteral] :bar
-#  117|       getValue: [IntegerLiteral] 2
-#  117|     getArgument: [Pair] Pair
-#  117|       getKey: [StringLiteral] "baz"
-#  117|         getComponent: [StringTextComponent] baz
-#  117|       getValue: [IntegerLiteral] 3
-#  118| [HashLiteral] {...}
+#  117|     getReceiver: [ConstantReadAccess] Array
+#  117|     getArgument: [StringLiteral] "foo"
+#  117|       getComponent: [StringTextComponent] foo
+#  117|     getArgument: [StringLiteral] "bar"
+#  117|       getComponent: [StringTextComponent] bar
+#  117|     getArgument: [StringLiteral] "baz"
+#  117|       getComponent: [StringTextComponent] baz
+#  118| [ArrayLiteral] %w(...)
 #  118|   getDesugared: [MethodCall] call to []
-#  118|     getReceiver: [ConstantReadAccess] Hash
-#  118|     getArgument: [Pair] Pair
-#  118|       getKey: [SymbolLiteral] :foo
-#  118|       getValue: [IntegerLiteral] 7
-#  118|     getArgument: [HashSplatExpr] ** ...
-#  118|       getAnOperand/getOperand/getReceiver: [MethodCall] call to baz
-#  118|         getReceiver: [Self, SelfVariableAccess] self
-#  185| [HashLiteral] {...}
-#  185|   getDesugared: [MethodCall] call to []
-#  185|     getReceiver: [ConstantReadAccess] Hash
-#  185|     getArgument: [Pair] Pair
-#  185|       getKey: [SymbolLiteral] :x
-#  185|       getValue: [LocalVariableAccess] x
-#  185|     getArgument: [Pair] Pair
-#  185|       getKey: [SymbolLiteral] :y
-#  185|       getValue: [IntegerLiteral] 5
-#  186| [HashLiteral] {...}
-#  186|   getDesugared: [MethodCall] call to []
-#  186|     getReceiver: [ConstantReadAccess] Hash
-#  186|     getArgument: [Pair] Pair
-#  186|       getKey: [SymbolLiteral] :y
-#  186|       getValue: [MethodCall] call to y
-#  186|     getArgument: [Pair] Pair
-#  186|       getKey: [SymbolLiteral] :Z
-#  186|       getValue: [ConstantReadAccess] Z
+#  118|     getReceiver: [ConstantReadAccess] Array
+#  118|     getArgument: [StringLiteral] "foo"
+#  118|       getComponent: [StringTextComponent] foo
+#  118|     getArgument: [StringLiteral] "bar#{...}"
+#  118|       getComponent: [StringTextComponent] bar
+#  118|       getComponent: [StringInterpolationComponent] #{...}
+#  118|         getStmt: [AddExpr] ... + ...
+#  118|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 1
+#  118|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 1
+#  118|     getArgument: [StringLiteral] "#{...}"
+#  118|       getComponent: [StringInterpolationComponent] #{...}
+#  118|         getStmt: [LocalVariableAccess] bar
+#  118|     getArgument: [StringLiteral] "#{...}"
+#  118|       getComponent: [StringInterpolationComponent] #{...}
+#  118|         getStmt: [ConstantReadAccess] BAR
+#  118|     getArgument: [StringLiteral] "baz"
+#  118|       getComponent: [StringTextComponent] baz
+#  119| [ArrayLiteral] %w(...)
+#  119|   getDesugared: [MethodCall] call to []
+#  119|     getReceiver: [ConstantReadAccess] Array
+#  119|     getArgument: [StringLiteral] "foo"
+#  119|       getComponent: [StringTextComponent] foo
+#  119|     getArgument: [StringLiteral] "bar#{1+1}"
+#  119|       getComponent: [StringTextComponent] bar#{1+1}
+#  119|     getArgument: [StringLiteral] "#{bar}"
+#  119|       getComponent: [StringTextComponent] #{bar}
+#  119|     getArgument: [StringLiteral] "#{BAR}"
+#  119|       getComponent: [StringTextComponent] #{BAR}
+#  119|     getArgument: [StringLiteral] "baz"
+#  119|       getComponent: [StringTextComponent] baz
+#  122| [ArrayLiteral] %i(...)
+#  122|   getDesugared: [MethodCall] call to []
+#  122|     getReceiver: [ConstantReadAccess] Array
+#  123| [ArrayLiteral] %i(...)
+#  123|   getDesugared: [MethodCall] call to []
+#  123|     getReceiver: [ConstantReadAccess] Array
+#  123|     getArgument: [SymbolLiteral] :"foo"
+#  123|       getComponent: [StringTextComponent] foo
+#  123|     getArgument: [SymbolLiteral] :"bar"
+#  123|       getComponent: [StringTextComponent] bar
+#  123|     getArgument: [SymbolLiteral] :"baz"
+#  123|       getComponent: [StringTextComponent] baz
+#  124| [ArrayLiteral] %i(...)
+#  124|   getDesugared: [MethodCall] call to []
+#  124|     getReceiver: [ConstantReadAccess] Array
+#  124|     getArgument: [SymbolLiteral] :"foo"
+#  124|       getComponent: [StringTextComponent] foo
+#  124|     getArgument: [SymbolLiteral] :"bar"
+#  124|       getComponent: [StringTextComponent] bar
+#  124|     getArgument: [SymbolLiteral] :"baz"
+#  124|       getComponent: [StringTextComponent] baz
+#  125| [ArrayLiteral] %i(...)
+#  125|   getDesugared: [MethodCall] call to []
+#  125|     getReceiver: [ConstantReadAccess] Array
+#  125|     getArgument: [SymbolLiteral] :"foo"
+#  125|       getComponent: [StringTextComponent] foo
+#  125|     getArgument: [SymbolLiteral] :"bar#{...}"
+#  125|       getComponent: [StringTextComponent] bar
+#  125|       getComponent: [StringInterpolationComponent] #{...}
+#  125|         getStmt: [AddExpr] ... + ...
+#  125|           getAnOperand/getLeftOperand/getReceiver: [IntegerLiteral] 2
+#  125|           getAnOperand/getArgument/getRightOperand: [IntegerLiteral] 4
+#  125|     getArgument: [SymbolLiteral] :"#{...}"
+#  125|       getComponent: [StringInterpolationComponent] #{...}
+#  125|         getStmt: [LocalVariableAccess] bar
+#  125|     getArgument: [SymbolLiteral] :"#{...}"
+#  125|       getComponent: [StringInterpolationComponent] #{...}
+#  125|         getStmt: [ConstantReadAccess] BAR
+#  125|     getArgument: [SymbolLiteral] :"baz"
+#  125|       getComponent: [StringTextComponent] baz
+#  126| [ArrayLiteral] %i(...)
+#  126|   getDesugared: [MethodCall] call to []
+#  126|     getReceiver: [ConstantReadAccess] Array
+#  126|     getArgument: [SymbolLiteral] :"foo"
+#  126|       getComponent: [StringTextComponent] foo
+#  126|     getArgument: [SymbolLiteral] :"bar#{"
+#  126|       getComponent: [StringTextComponent] bar#{
+#  126|     getArgument: [SymbolLiteral] :"2"
+#  126|       getComponent: [StringTextComponent] 2
+#  126|     getArgument: [SymbolLiteral] :"+"
+#  126|       getComponent: [StringTextComponent] +
+#  126|     getArgument: [SymbolLiteral] :"4"
+#  126|       getComponent: [StringTextComponent] 4
+#  126|     getArgument: [SymbolLiteral] :"}"
+#  126|       getComponent: [StringTextComponent] }
+#  126|     getArgument: [SymbolLiteral] :"#{bar}"
+#  126|       getComponent: [StringTextComponent] #{bar}
+#  126|     getArgument: [SymbolLiteral] :"#{BAR}"
+#  126|       getComponent: [StringTextComponent] #{BAR}
+#  126|     getArgument: [SymbolLiteral] :"baz"
+#  126|       getComponent: [StringTextComponent] baz
+#  129| [HashLiteral] {...}
+#  129|   getDesugared: [MethodCall] call to []
+#  129|     getReceiver: [ConstantReadAccess] Hash
+#  130| [HashLiteral] {...}
+#  130|   getDesugared: [MethodCall] call to []
+#  130|     getReceiver: [ConstantReadAccess] Hash
+#  130|     getArgument: [Pair] Pair
+#  130|       getKey: [SymbolLiteral] :foo
+#  130|       getValue: [IntegerLiteral] 1
+#  130|     getArgument: [Pair] Pair
+#  130|       getKey: [SymbolLiteral] :bar
+#  130|       getValue: [IntegerLiteral] 2
+#  130|     getArgument: [Pair] Pair
+#  130|       getKey: [StringLiteral] "baz"
+#  130|         getComponent: [StringTextComponent] baz
+#  130|       getValue: [IntegerLiteral] 3
+#  131| [HashLiteral] {...}
+#  131|   getDesugared: [MethodCall] call to []
+#  131|     getReceiver: [ConstantReadAccess] Hash
+#  131|     getArgument: [Pair] Pair
+#  131|       getKey: [SymbolLiteral] :foo
+#  131|       getValue: [IntegerLiteral] 7
+#  131|     getArgument: [HashSplatExpr] ** ...
+#  131|       getAnOperand/getOperand/getReceiver: [MethodCall] call to baz
+#  131|         getReceiver: [SelfVariableAccess] self
+#  198| [HashLiteral] {...}
+#  198|   getDesugared: [MethodCall] call to []
+#  198|     getReceiver: [ConstantReadAccess] Hash
+#  198|     getArgument: [Pair] Pair
+#  198|       getKey: [SymbolLiteral] :x
+#  198|       getValue: [LocalVariableAccess] x
+#  198|     getArgument: [Pair] Pair
+#  198|       getKey: [SymbolLiteral] :y
+#  198|       getValue: [IntegerLiteral] 5
+#  199| [HashLiteral] {...}
+#  199|   getDesugared: [MethodCall] call to []
+#  199|     getReceiver: [ConstantReadAccess] Hash
+#  199|     getArgument: [Pair] Pair
+#  199|       getKey: [SymbolLiteral] :y
+#  199|       getValue: [MethodCall] call to y
+#  199|     getArgument: [Pair] Pair
+#  199|       getKey: [SymbolLiteral] :Z
+#  199|       getValue: [ConstantReadAccess] Z
 control/loops.rb:
 #    9| [ForExpr] for ... in ...
 #    9|   getDesugared: [MethodCall] call to each
diff --git a/ruby/ql/test/library-tests/ast/ValueText.expected b/ruby/ql/test/library-tests/ast/ValueText.expected
index a99080f04ba..c1b9a70d731 100644
--- a/ruby/ql/test/library-tests/ast/ValueText.expected
+++ b/ruby/ql/test/library-tests/ast/ValueText.expected
@@ -345,6 +345,81 @@
 | erb/template.html.erb:27:16:27:20 | "foo" | foo |
 | erb/template.html.erb:27:23:27:27 | "bar" | bar |
 | erb/template.html.erb:27:30:27:34 | "baz" | baz |
+| escape_sequences/escapes.rb:6:1:6:4 | "\\'" | ' |
+| escape_sequences/escapes.rb:7:1:7:4 | "\\"" | \\" |
+| escape_sequences/escapes.rb:8:1:8:4 | "\\\\" | \\ |
+| escape_sequences/escapes.rb:9:1:9:4 | "\\1" | \\1 |
+| escape_sequences/escapes.rb:10:1:10:5 | "\\\\1" | \\1 |
+| escape_sequences/escapes.rb:11:1:11:6 | "\\141" | \\141 |
+| escape_sequences/escapes.rb:12:1:12:4 | "\\n" | \\n |
+| escape_sequences/escapes.rb:15:1:15:4 | "\\'" | ' |
+| escape_sequences/escapes.rb:16:1:16:4 | "\\"" | " |
+| escape_sequences/escapes.rb:17:1:17:4 | "\\\\" | \\ |
+| escape_sequences/escapes.rb:18:1:18:4 | "\\1" | \u0001 |
+| escape_sequences/escapes.rb:19:1:19:5 | "\\\\1" | \\1 |
+| escape_sequences/escapes.rb:20:1:20:6 | "\\141" | a |
+| escape_sequences/escapes.rb:21:1:21:6 | "\\x6d" | m |
+| escape_sequences/escapes.rb:22:1:22:6 | "\\x6E" | n |
+| escape_sequences/escapes.rb:23:1:23:6 | "\\X6d" | X6d |
+| escape_sequences/escapes.rb:24:1:24:6 | "\\X6E" | X6E |
+| escape_sequences/escapes.rb:25:1:25:8 | "\\u203d" | \u203d |
+| escape_sequences/escapes.rb:26:1:26:8 | "\\u{62}" | b |
+| escape_sequences/escapes.rb:27:1:27:11 | "\\u{1f60a}" | \ud83d\ude0a |
+| escape_sequences/escapes.rb:28:1:28:4 | "\\a" | \u0007 |
+| escape_sequences/escapes.rb:29:1:29:4 | "\\b" | \u0008 |
+| escape_sequences/escapes.rb:30:1:30:4 | "\\t" | \t |
+| escape_sequences/escapes.rb:31:1:31:4 | "\\n" | \n |
+| escape_sequences/escapes.rb:32:1:32:4 | "\\v" | \u000b |
+| escape_sequences/escapes.rb:33:1:33:4 | "\\f" | \u000c |
+| escape_sequences/escapes.rb:34:1:34:4 | "\\r" | \r |
+| escape_sequences/escapes.rb:35:1:35:4 | "\\e" | \u001b |
+| escape_sequences/escapes.rb:36:1:36:4 | "\\s" |   |
+| escape_sequences/escapes.rb:37:1:37:5 | "\\c?" | c? |
+| escape_sequences/escapes.rb:38:1:38:6 | "\\C-?" | C-? |
+| escape_sequences/escapes.rb:43:5:43:9 | "\\\\." | \\. |
+| escape_sequences/escapes.rb:44:1:44:6 | "#{...}" | \\. |
+| escape_sequences/escapes.rb:44:4:44:4 | a | \\. |
+| escape_sequences/escapes.rb:48:1:48:4 | /\\n/ | \\n |
+| escape_sequences/escapes.rb:49:1:49:4 | /\\p/ | \\p |
+| escape_sequences/escapes.rb:50:1:50:8 | /\\u0061/ | \\u0061 |
+| escape_sequences/escapes.rb:53:5:53:9 | "\\\\." | \\. |
+| escape_sequences/escapes.rb:54:5:54:8 | /\\./ | \\. |
+| escape_sequences/escapes.rb:55:1:55:10 | /#{...}#{...}/ | \\.\\. |
+| escape_sequences/escapes.rb:55:4:55:4 | a | \\. |
+| escape_sequences/escapes.rb:55:8:55:8 | b | \\. |
+| escape_sequences/escapes.rb:58:4:58:9 | "foo \\n" | foo\\n |
+| escape_sequences/escapes.rb:58:11:58:13 | "bar" | bar |
+| escape_sequences/escapes.rb:61:1:61:5 | :"\\'" | :' |
+| escape_sequences/escapes.rb:62:1:62:5 | :"\\"" | :\\" |
+| escape_sequences/escapes.rb:63:1:63:5 | :"\\\\" | :\\ |
+| escape_sequences/escapes.rb:64:1:64:5 | :"\\1" | :\\1 |
+| escape_sequences/escapes.rb:65:1:65:6 | :"\\\\1" | :\\1 |
+| escape_sequences/escapes.rb:66:1:66:7 | :"\\141" | :\\141 |
+| escape_sequences/escapes.rb:67:1:67:5 | :"\\n" | :\\n |
+| escape_sequences/escapes.rb:70:1:70:5 | :"\\'" | :' |
+| escape_sequences/escapes.rb:71:1:71:5 | :"\\"" | :" |
+| escape_sequences/escapes.rb:72:1:72:5 | :"\\\\" | :\\ |
+| escape_sequences/escapes.rb:73:1:73:5 | :"\\1" | :\u0001 |
+| escape_sequences/escapes.rb:74:1:74:6 | :"\\\\1" | :\\1 |
+| escape_sequences/escapes.rb:75:1:75:7 | :"\\141" | :a |
+| escape_sequences/escapes.rb:76:1:76:7 | :"\\x6d" | :m |
+| escape_sequences/escapes.rb:77:1:77:7 | :"\\x6E" | :n |
+| escape_sequences/escapes.rb:78:1:78:7 | :"\\X6d" | :X6d |
+| escape_sequences/escapes.rb:79:1:79:7 | :"\\X6E" | :X6E |
+| escape_sequences/escapes.rb:80:1:80:9 | :"\\u203d" | :\u203d |
+| escape_sequences/escapes.rb:81:1:81:9 | :"\\u{62}" | :b |
+| escape_sequences/escapes.rb:82:1:82:12 | :"\\u{1f60a}" | :\ud83d\ude0a |
+| escape_sequences/escapes.rb:83:1:83:5 | :"\\a" | :\u0007 |
+| escape_sequences/escapes.rb:84:1:84:5 | :"\\b" | :\u0008 |
+| escape_sequences/escapes.rb:85:1:85:5 | :"\\t" | :\t |
+| escape_sequences/escapes.rb:86:1:86:5 | :"\\n" | :\n |
+| escape_sequences/escapes.rb:87:1:87:5 | :"\\v" | :\u000b |
+| escape_sequences/escapes.rb:88:1:88:5 | :"\\f" | :\u000c |
+| escape_sequences/escapes.rb:89:1:89:5 | :"\\r" | :\r |
+| escape_sequences/escapes.rb:90:1:90:5 | :"\\e" | :\u001b |
+| escape_sequences/escapes.rb:91:1:91:5 | :"\\s" | :  |
+| escape_sequences/escapes.rb:92:1:92:6 | :"\\c?" | :c? |
+| escape_sequences/escapes.rb:93:1:93:7 | :"\\C-?" | :C-? |
 | gems/Gemfile:1:8:1:29 | "https://rubygems.org" | https://rubygems.org |
 | gems/Gemfile:3:5:3:13 | "foo_gem" | foo_gem |
 | gems/Gemfile:3:16:3:23 | "~> 2.0" | ~> 2.0 |
@@ -378,218 +453,225 @@
 | literals/literals.rb:11:1:11:5 | 5_678 | 5678 |
 | literals/literals.rb:12:1:12:1 | 0 | 0 |
 | literals/literals.rb:13:1:13:5 | 0d900 | 0 |
-| literals/literals.rb:16:1:16:6 | 0x1234 | 4660 |
-| literals/literals.rb:17:1:17:10 | 0xdeadbeef | -559038737 |
-| literals/literals.rb:18:1:18:11 | 0xF00D_face | -267519282 |
-| literals/literals.rb:21:1:21:4 | 0123 | 83 |
-| literals/literals.rb:22:1:22:5 | 0o234 | 156 |
-| literals/literals.rb:23:1:23:6 | 0O45_6 | 302 |
-| literals/literals.rb:26:1:26:10 | 0b10010100 | 148 |
-| literals/literals.rb:27:1:27:11 | 0B011_01101 | 109 |
-| literals/literals.rb:30:1:30:5 | 12.34 | 12.34 |
-| literals/literals.rb:31:1:31:7 | 1234e-2 | 12.34 |
-| literals/literals.rb:32:1:32:7 | 1.234E1 | 12.34 |
-| literals/literals.rb:35:1:35:3 | 23r | 23/1 |
-| literals/literals.rb:36:1:36:5 | 9.85r | 985/100 |
-| literals/literals.rb:39:1:39:2 | 2i | 0+2i |
-| literals/literals.rb:46:1:46:2 | "" |  |
-| literals/literals.rb:47:1:47:2 | "" |  |
-| literals/literals.rb:48:1:48:7 | "hello" | hello |
-| literals/literals.rb:49:1:49:9 | "goodbye" | goodbye |
-| literals/literals.rb:50:1:50:30 | "string with escaped \\" quote" | string with escaped \\" quote |
-| literals/literals.rb:51:1:51:21 | "string with " quote" | string with " quote |
-| literals/literals.rb:52:1:52:14 | "foo bar baz" | foo bar baz |
-| literals/literals.rb:53:1:53:15 | "foo bar baz" | foo bar baz |
-| literals/literals.rb:54:1:54:20 | "foo ' bar " baz'" | foo ' bar " baz' |
-| literals/literals.rb:55:1:55:20 | "FOO ' BAR " BAZ'" | FOO ' BAR " BAZ' |
-| literals/literals.rb:56:1:56:12 | "foo\\ bar" | foo\\ bar |
-| literals/literals.rb:57:1:57:12 | "foo\\ bar" | foo\\ bar |
-| literals/literals.rb:58:1:58:20 | "2 + 2 = #{...}" | 2 + 2 = 4 |
-| literals/literals.rb:58:13:58:13 | 2 | 2 |
-| literals/literals.rb:58:13:58:17 | ... + ... | 4 |
-| literals/literals.rb:58:17:58:17 | 2 | 2 |
-| literals/literals.rb:59:1:59:22 | "3 + 4 = #{...}" | 3 + 4 = 7 |
-| literals/literals.rb:59:15:59:15 | 3 | 3 |
-| literals/literals.rb:59:15:59:19 | ... + ... | 7 |
-| literals/literals.rb:59:19:59:19 | 4 | 4 |
-| literals/literals.rb:60:1:60:20 | "2 + 2 = #{ 2 + 2 }" | 2 + 2 = #{ 2 + 2 } |
-| literals/literals.rb:61:1:61:22 | "3 + 4 = #{ 3 + 4 }" | 3 + 4 = #{ 3 + 4 } |
-| literals/literals.rb:62:1:62:5 | "foo" | foo |
-| literals/literals.rb:62:7:62:11 | "bar" | bar |
-| literals/literals.rb:62:13:62:17 | "baz" | baz |
-| literals/literals.rb:63:1:63:7 | "foo" | foo |
-| literals/literals.rb:63:9:63:13 | "bar" | bar |
-| literals/literals.rb:63:15:63:19 | "baz" | baz |
-| literals/literals.rb:64:1:64:5 | "foo" | foo |
-| literals/literals.rb:64:7:64:21 | "bar#{...}" | bar1 |
-| literals/literals.rb:64:14:64:14 | 1 | 1 |
-| literals/literals.rb:64:14:64:18 | ... * ... | 1 |
-| literals/literals.rb:64:18:64:18 | 1 | 1 |
-| literals/literals.rb:64:23:64:27 | "baz" | baz |
-| literals/literals.rb:65:1:65:35 | "foo #{...} qux" | foo bar 5 baz qux |
-| literals/literals.rb:65:9:65:28 | "bar #{...} baz" | bar 5 baz |
-| literals/literals.rb:65:17:65:17 | 2 | 2 |
-| literals/literals.rb:65:17:65:21 | ... + ... | 5 |
-| literals/literals.rb:65:21:65:21 | 3 | 3 |
-| literals/literals.rb:66:1:66:22 | "foo #{...}" | foo 10 |
-| literals/literals.rb:66:17:66:17 | 1 | 1 |
-| literals/literals.rb:66:17:66:19 | ... + ... | 10 |
-| literals/literals.rb:66:19:66:19 | 9 | 9 |
-| literals/literals.rb:67:7:67:11 | "bar" | bar |
-| literals/literals.rb:68:7:68:11 | "bar" | bar |
-| literals/literals.rb:69:1:69:14 | "foo #{...}" | foo bar |
-| literals/literals.rb:69:9:69:11 | bar | bar |
-| literals/literals.rb:70:1:70:14 | "foo #{...}" | foo bar |
-| literals/literals.rb:70:9:70:11 | BAR | bar |
-| literals/literals.rb:73:1:73:2 | ?x | ?x |
-| literals/literals.rb:74:1:74:3 | ?\\n | ?\\n |
-| literals/literals.rb:75:1:75:3 | ?\\s | ?\\s |
-| literals/literals.rb:76:1:76:3 | ?\\\\ | ?\\\\ |
-| literals/literals.rb:77:1:77:7 | ?\\u{58} | ?\\u{58} |
-| literals/literals.rb:78:1:78:5 | ?\\C-a | ?\\C-a |
-| literals/literals.rb:79:1:79:5 | ?\\M-a | ?\\M-a |
-| literals/literals.rb:80:1:80:8 | ?\\M-\\C-a | ?\\M-\\C-a |
-| literals/literals.rb:81:1:81:8 | ?\\C-\\M-a | ?\\C-\\M-a |
-| literals/literals.rb:84:1:84:3 | :"" | : |
-| literals/literals.rb:85:1:85:6 | :hello | :hello |
-| literals/literals.rb:86:1:86:10 | :"foo bar" | :foo bar |
-| literals/literals.rb:87:1:87:10 | :"bar baz" | :bar baz |
-| literals/literals.rb:88:3:88:5 | :foo | :foo |
-| literals/literals.rb:88:8:88:12 | "bar" | bar |
-| literals/literals.rb:89:1:89:10 | :"wibble" | :wibble |
-| literals/literals.rb:90:1:90:17 | :"wibble wobble" | :wibble wobble |
-| literals/literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | :foo_4_bar_bar |
-| literals/literals.rb:91:10:91:10 | 2 | 2 |
-| literals/literals.rb:91:10:91:14 | ... + ... | 4 |
-| literals/literals.rb:91:14:91:14 | 2 | 2 |
-| literals/literals.rb:91:19:91:21 | bar | bar |
-| literals/literals.rb:91:26:91:28 | BAR | bar |
-| literals/literals.rb:92:1:92:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
-| literals/literals.rb:93:1:93:18 | :"foo_#{ 3 - 2 }" | :foo_#{ 3 - 2 } |
-| literals/literals.rb:97:2:97:2 | 1 | 1 |
-| literals/literals.rb:97:5:97:5 | 2 | 2 |
-| literals/literals.rb:97:8:97:8 | 3 | 3 |
-| literals/literals.rb:98:2:98:2 | 4 | 4 |
-| literals/literals.rb:98:5:98:5 | 5 | 5 |
-| literals/literals.rb:98:8:98:9 | 12 | 12 |
-| literals/literals.rb:98:8:98:13 | ... / ... | 6 |
-| literals/literals.rb:98:13:98:13 | 2 | 2 |
-| literals/literals.rb:99:2:99:2 | 7 | 7 |
-| literals/literals.rb:99:6:99:6 | 8 | 8 |
-| literals/literals.rb:99:9:99:9 | 9 | 9 |
-| literals/literals.rb:103:4:103:6 | "foo" | foo |
-| literals/literals.rb:103:8:103:10 | "bar" | bar |
-| literals/literals.rb:103:12:103:14 | "baz" | baz |
-| literals/literals.rb:104:4:104:6 | "foo" | foo |
-| literals/literals.rb:104:8:104:10 | "bar" | bar |
-| literals/literals.rb:104:12:104:14 | "baz" | baz |
-| literals/literals.rb:105:4:105:6 | "foo" | foo |
-| literals/literals.rb:105:8:105:16 | "bar#{...}" | bar2 |
-| literals/literals.rb:105:13:105:13 | 1 | 1 |
-| literals/literals.rb:105:13:105:15 | ... + ... | 2 |
-| literals/literals.rb:105:15:105:15 | 1 | 1 |
-| literals/literals.rb:105:18:105:23 | "#{...}" | bar |
-| literals/literals.rb:105:20:105:22 | bar | bar |
-| literals/literals.rb:105:25:105:30 | "#{...}" | bar |
-| literals/literals.rb:105:27:105:29 | BAR | bar |
-| literals/literals.rb:105:32:105:34 | "baz" | baz |
-| literals/literals.rb:106:4:106:6 | "foo" | foo |
-| literals/literals.rb:106:8:106:16 | "bar#{1+1}" | bar#{1+1} |
-| literals/literals.rb:106:18:106:23 | "#{bar}" | #{bar} |
-| literals/literals.rb:106:25:106:30 | "#{BAR}" | #{BAR} |
-| literals/literals.rb:106:32:106:34 | "baz" | baz |
-| literals/literals.rb:110:4:110:6 | :"foo" | :foo |
-| literals/literals.rb:110:8:110:10 | :"bar" | :bar |
-| literals/literals.rb:110:12:110:14 | :"baz" | :baz |
-| literals/literals.rb:111:4:111:6 | :"foo" | :foo |
-| literals/literals.rb:111:8:111:10 | :"bar" | :bar |
-| literals/literals.rb:111:12:111:14 | :"baz" | :baz |
-| literals/literals.rb:112:4:112:6 | :"foo" | :foo |
-| literals/literals.rb:112:8:112:20 | :"bar#{...}" | :bar6 |
-| literals/literals.rb:112:14:112:14 | 2 | 2 |
-| literals/literals.rb:112:14:112:18 | ... + ... | 6 |
-| literals/literals.rb:112:18:112:18 | 4 | 4 |
-| literals/literals.rb:112:22:112:27 | :"#{...}" | :bar |
-| literals/literals.rb:112:24:112:26 | bar | bar |
-| literals/literals.rb:112:29:112:34 | :"#{...}" | :bar |
-| literals/literals.rb:112:31:112:33 | BAR | bar |
-| literals/literals.rb:112:36:112:38 | :"baz" | :baz |
-| literals/literals.rb:113:4:113:6 | :"foo" | :foo |
-| literals/literals.rb:113:8:113:12 | :"bar#{" | :bar#{ |
-| literals/literals.rb:113:14:113:14 | :"2" | :2 |
-| literals/literals.rb:113:16:113:16 | :"+" | :+ |
-| literals/literals.rb:113:18:113:18 | :"4" | :4 |
-| literals/literals.rb:113:20:113:20 | :"}" | :} |
-| literals/literals.rb:113:22:113:27 | :"#{bar}" | :#{bar} |
-| literals/literals.rb:113:29:113:34 | :"#{BAR}" | :#{BAR} |
-| literals/literals.rb:113:36:113:38 | :"baz" | :baz |
-| literals/literals.rb:117:3:117:5 | :foo | :foo |
-| literals/literals.rb:117:8:117:8 | 1 | 1 |
-| literals/literals.rb:117:11:117:14 | :bar | :bar |
-| literals/literals.rb:117:19:117:19 | 2 | 2 |
-| literals/literals.rb:117:22:117:26 | "baz" | baz |
-| literals/literals.rb:117:31:117:31 | 3 | 3 |
-| literals/literals.rb:118:3:118:5 | :foo | :foo |
-| literals/literals.rb:118:8:118:8 | 7 | 7 |
-| literals/literals.rb:121:2:121:2 | 1 | 1 |
-| literals/literals.rb:121:5:121:6 | 10 | 10 |
-| literals/literals.rb:122:2:122:2 | 1 | 1 |
-| literals/literals.rb:122:6:122:7 | 10 | 10 |
-| literals/literals.rb:123:2:123:2 | 1 | 1 |
-| literals/literals.rb:123:7:123:7 | 0 | 0 |
-| literals/literals.rb:124:9:124:9 | 2 | 2 |
-| literals/literals.rb:124:9:124:11 | ... + ... | 5 |
-| literals/literals.rb:124:11:124:11 | 3 | 3 |
-| literals/literals.rb:125:2:125:2 | 1 | 1 |
-| literals/literals.rb:126:4:126:4 | 1 | 1 |
-| literals/literals.rb:127:2:127:2 | 0 | 0 |
-| literals/literals.rb:127:6:127:6 | 1 | 1 |
-| literals/literals.rb:130:1:130:7 | `ls -l` | ls -l |
-| literals/literals.rb:131:1:131:9 | `ls -l` | ls -l |
-| literals/literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | du -d 2 bar bar |
-| literals/literals.rb:132:11:132:11 | 1 | 1 |
-| literals/literals.rb:132:11:132:15 | ... + ... | 2 |
-| literals/literals.rb:132:15:132:15 | 1 | 1 |
-| literals/literals.rb:132:21:132:23 | bar | bar |
-| literals/literals.rb:132:28:132:30 | BAR | bar |
-| literals/literals.rb:133:1:133:20 | `du -d #{...}` | du -d 1 |
-| literals/literals.rb:133:13:133:13 | 5 | 5 |
-| literals/literals.rb:133:13:133:17 | ... - ... | 1 |
-| literals/literals.rb:133:17:133:17 | 4 | 4 |
-| literals/literals.rb:136:1:136:2 | // |  |
-| literals/literals.rb:137:1:137:5 | /foo/ | foo |
-| literals/literals.rb:138:1:138:6 | /foo/ | foo |
-| literals/literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
-| literals/literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
-| literals/literals.rb:140:8:140:8 | 1 | 1 |
-| literals/literals.rb:140:8:140:12 | ... + ... | 2 |
-| literals/literals.rb:140:12:140:12 | 1 | 1 |
-| literals/literals.rb:140:20:140:22 | bar | bar |
-| literals/literals.rb:140:26:140:28 | BAR | bar |
-| literals/literals.rb:142:1:142:4 | // |  |
-| literals/literals.rb:143:1:143:7 | /foo/ | foo |
-| literals/literals.rb:144:1:144:8 | /foo/ | foo |
-| literals/literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
-| literals/literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
-| literals/literals.rb:146:10:146:10 | 1 | 1 |
-| literals/literals.rb:146:10:146:14 | ... + ... | 2 |
-| literals/literals.rb:146:14:146:14 | 1 | 1 |
-| literals/literals.rb:146:22:146:24 | bar | bar |
-| literals/literals.rb:146:28:146:30 | BAR | bar |
-| literals/literals.rb:150:1:150:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | abcdefghijklmnopqrstuvwxyzabcdef |
-| literals/literals.rb:151:1:151:35 | "foobarfoobarfoobarfoobarfooba..." | foobarfoobarfoobarfoobarfoobarfoo |
-| literals/literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | foobar\\\\foobar\\\\foobar\\\\foobar\\\\foobar |
-| literals/literals.rb:155:9:155:13 | <<SQL | \nselect * from table\n |
-| literals/literals.rb:162:11:162:16 | <<-BLA | \nsome text\\nand some more\n   |
-| literals/literals.rb:167:9:167:19 | <<~SQUIGGLY | \n   indented stuff\n |
-| literals/literals.rb:180:10:180:19 | <<`SCRIPT` | \n cat file.txt\n |
-| literals/literals.rb:184:5:184:6 | 42 | 42 |
-| literals/literals.rb:185:2:185:2 | :x | :x |
-| literals/literals.rb:185:2:185:2 | x | 42 |
-| literals/literals.rb:185:6:185:6 | :y | :y |
-| literals/literals.rb:185:8:185:8 | 5 | 5 |
-| literals/literals.rb:186:2:186:2 | :y | :y |
-| literals/literals.rb:186:7:186:7 | :Z | :Z |
+| literals/literals.rb:14:1:14:10 | 2147483647 | 2147483647 |
+| literals/literals.rb:18:1:18:6 | 0x1234 | 4660 |
+| literals/literals.rb:19:1:19:6 | 0xbeef | 48879 |
+| literals/literals.rb:20:1:20:7 | 0xF0_0D | 61453 |
+| literals/literals.rb:21:1:21:22 | 0x000000000000000000ff | 255 |
+| literals/literals.rb:22:1:22:11 | 0x7FFF_FFFF | 2147483647 |
+| literals/literals.rb:28:1:28:4 | 0123 | 83 |
+| literals/literals.rb:29:1:29:5 | 0o234 | 156 |
+| literals/literals.rb:30:1:30:6 | 0O45_6 | 302 |
+| literals/literals.rb:31:1:31:31 | 0000000000000000000000000000010 | 8 |
+| literals/literals.rb:32:1:32:12 | 017777777777 | 2147483647 |
+| literals/literals.rb:36:1:36:10 | 0b10010100 | 148 |
+| literals/literals.rb:37:1:37:11 | 0B011_01101 | 109 |
+| literals/literals.rb:38:1:38:43 | 0b00000000000000000000000000000000000000011 | 3 |
+| literals/literals.rb:39:1:39:34 | 0b01111111111111111111111111111111 | 2147483647 |
+| literals/literals.rb:43:1:43:5 | 12.34 | 12.34 |
+| literals/literals.rb:44:1:44:7 | 1234e-2 | 12.34 |
+| literals/literals.rb:45:1:45:7 | 1.234E1 | 12.34 |
+| literals/literals.rb:48:1:48:3 | 23r | 23/1 |
+| literals/literals.rb:49:1:49:5 | 9.85r | 985/100 |
+| literals/literals.rb:52:1:52:2 | 2i | 0+2i |
+| literals/literals.rb:59:1:59:2 | "" |  |
+| literals/literals.rb:60:1:60:2 | "" |  |
+| literals/literals.rb:61:1:61:7 | "hello" | hello |
+| literals/literals.rb:62:1:62:9 | "goodbye" | goodbye |
+| literals/literals.rb:63:1:63:30 | "string with escaped \\" quote" | string with escaped " quote |
+| literals/literals.rb:64:1:64:21 | "string with " quote" | string with " quote |
+| literals/literals.rb:65:1:65:14 | "foo bar baz" | foo bar baz |
+| literals/literals.rb:66:1:66:15 | "foo bar baz" | foo bar baz |
+| literals/literals.rb:67:1:67:20 | "foo ' bar " baz'" | foo ' bar " baz' |
+| literals/literals.rb:68:1:68:20 | "FOO ' BAR " BAZ'" | FOO ' BAR " BAZ' |
+| literals/literals.rb:69:1:69:12 | "foo\\ bar" | foo\\ bar |
+| literals/literals.rb:70:1:70:12 | "foo\\ bar" | foo bar |
+| literals/literals.rb:71:1:71:20 | "2 + 2 = #{...}" | 2 + 2 = 4 |
+| literals/literals.rb:71:13:71:13 | 2 | 2 |
+| literals/literals.rb:71:13:71:17 | ... + ... | 4 |
+| literals/literals.rb:71:17:71:17 | 2 | 2 |
+| literals/literals.rb:72:1:72:22 | "3 + 4 = #{...}" | 3 + 4 = 7 |
+| literals/literals.rb:72:15:72:15 | 3 | 3 |
+| literals/literals.rb:72:15:72:19 | ... + ... | 7 |
+| literals/literals.rb:72:19:72:19 | 4 | 4 |
+| literals/literals.rb:73:1:73:20 | "2 + 2 = #{ 2 + 2 }" | 2 + 2 = #{ 2 + 2 } |
+| literals/literals.rb:74:1:74:22 | "3 + 4 = #{ 3 + 4 }" | 3 + 4 = #{ 3 + 4 } |
+| literals/literals.rb:75:1:75:5 | "foo" | foo |
+| literals/literals.rb:75:7:75:11 | "bar" | bar |
+| literals/literals.rb:75:13:75:17 | "baz" | baz |
+| literals/literals.rb:76:1:76:7 | "foo" | foo |
+| literals/literals.rb:76:9:76:13 | "bar" | bar |
+| literals/literals.rb:76:15:76:19 | "baz" | baz |
+| literals/literals.rb:77:1:77:5 | "foo" | foo |
+| literals/literals.rb:77:7:77:21 | "bar#{...}" | bar1 |
+| literals/literals.rb:77:14:77:14 | 1 | 1 |
+| literals/literals.rb:77:14:77:18 | ... * ... | 1 |
+| literals/literals.rb:77:18:77:18 | 1 | 1 |
+| literals/literals.rb:77:23:77:27 | "baz" | baz |
+| literals/literals.rb:78:1:78:35 | "foo #{...} qux" | foo bar 5 baz qux |
+| literals/literals.rb:78:9:78:28 | "bar #{...} baz" | bar 5 baz |
+| literals/literals.rb:78:17:78:17 | 2 | 2 |
+| literals/literals.rb:78:17:78:21 | ... + ... | 5 |
+| literals/literals.rb:78:21:78:21 | 3 | 3 |
+| literals/literals.rb:79:1:79:22 | "foo #{...}" | foo 10 |
+| literals/literals.rb:79:17:79:17 | 1 | 1 |
+| literals/literals.rb:79:17:79:19 | ... + ... | 10 |
+| literals/literals.rb:79:19:79:19 | 9 | 9 |
+| literals/literals.rb:80:7:80:11 | "bar" | bar |
+| literals/literals.rb:81:7:81:11 | "bar" | bar |
+| literals/literals.rb:82:1:82:14 | "foo #{...}" | foo bar |
+| literals/literals.rb:82:9:82:11 | bar | bar |
+| literals/literals.rb:83:1:83:14 | "foo #{...}" | foo bar |
+| literals/literals.rb:83:9:83:11 | BAR | bar |
+| literals/literals.rb:86:1:86:2 | ?x | ?x |
+| literals/literals.rb:87:1:87:3 | ?\\n | ?\\n |
+| literals/literals.rb:88:1:88:3 | ?\\s | ?\\s |
+| literals/literals.rb:89:1:89:3 | ?\\\\ | ?\\\\ |
+| literals/literals.rb:90:1:90:7 | ?\\u{58} | ?\\u{58} |
+| literals/literals.rb:91:1:91:5 | ?\\C-a | ?\\C-a |
+| literals/literals.rb:92:1:92:5 | ?\\M-a | ?\\M-a |
+| literals/literals.rb:93:1:93:8 | ?\\M-\\C-a | ?\\M-\\C-a |
+| literals/literals.rb:94:1:94:8 | ?\\C-\\M-a | ?\\C-\\M-a |
+| literals/literals.rb:97:1:97:3 | :"" | : |
+| literals/literals.rb:98:1:98:6 | :hello | :hello |
+| literals/literals.rb:99:1:99:10 | :"foo bar" | :foo bar |
+| literals/literals.rb:100:1:100:10 | :"bar baz" | :bar baz |
+| literals/literals.rb:101:3:101:5 | :foo | :foo |
+| literals/literals.rb:101:8:101:12 | "bar" | bar |
+| literals/literals.rb:102:1:102:10 | :"wibble" | :wibble |
+| literals/literals.rb:103:1:103:17 | :"wibble wobble" | :wibble wobble |
+| literals/literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | :foo_4_bar_bar |
+| literals/literals.rb:104:10:104:10 | 2 | 2 |
+| literals/literals.rb:104:10:104:14 | ... + ... | 4 |
+| literals/literals.rb:104:14:104:14 | 2 | 2 |
+| literals/literals.rb:104:19:104:21 | bar | bar |
+| literals/literals.rb:104:26:104:28 | BAR | bar |
+| literals/literals.rb:105:1:105:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
+| literals/literals.rb:106:1:106:18 | :"foo_#{ 3 - 2 }" | :foo_#{ 3 - 2 } |
+| literals/literals.rb:110:2:110:2 | 1 | 1 |
+| literals/literals.rb:110:5:110:5 | 2 | 2 |
+| literals/literals.rb:110:8:110:8 | 3 | 3 |
+| literals/literals.rb:111:2:111:2 | 4 | 4 |
+| literals/literals.rb:111:5:111:5 | 5 | 5 |
+| literals/literals.rb:111:8:111:9 | 12 | 12 |
+| literals/literals.rb:111:8:111:13 | ... / ... | 6 |
+| literals/literals.rb:111:13:111:13 | 2 | 2 |
+| literals/literals.rb:112:2:112:2 | 7 | 7 |
+| literals/literals.rb:112:6:112:6 | 8 | 8 |
+| literals/literals.rb:112:9:112:9 | 9 | 9 |
+| literals/literals.rb:116:4:116:6 | "foo" | foo |
+| literals/literals.rb:116:8:116:10 | "bar" | bar |
+| literals/literals.rb:116:12:116:14 | "baz" | baz |
+| literals/literals.rb:117:4:117:6 | "foo" | foo |
+| literals/literals.rb:117:8:117:10 | "bar" | bar |
+| literals/literals.rb:117:12:117:14 | "baz" | baz |
+| literals/literals.rb:118:4:118:6 | "foo" | foo |
+| literals/literals.rb:118:8:118:16 | "bar#{...}" | bar2 |
+| literals/literals.rb:118:13:118:13 | 1 | 1 |
+| literals/literals.rb:118:13:118:15 | ... + ... | 2 |
+| literals/literals.rb:118:15:118:15 | 1 | 1 |
+| literals/literals.rb:118:18:118:23 | "#{...}" | bar |
+| literals/literals.rb:118:20:118:22 | bar | bar |
+| literals/literals.rb:118:25:118:30 | "#{...}" | bar |
+| literals/literals.rb:118:27:118:29 | BAR | bar |
+| literals/literals.rb:118:32:118:34 | "baz" | baz |
+| literals/literals.rb:119:4:119:6 | "foo" | foo |
+| literals/literals.rb:119:8:119:16 | "bar#{1+1}" | bar#{1+1} |
+| literals/literals.rb:119:18:119:23 | "#{bar}" | #{bar} |
+| literals/literals.rb:119:25:119:30 | "#{BAR}" | #{BAR} |
+| literals/literals.rb:119:32:119:34 | "baz" | baz |
+| literals/literals.rb:123:4:123:6 | :"foo" | :foo |
+| literals/literals.rb:123:8:123:10 | :"bar" | :bar |
+| literals/literals.rb:123:12:123:14 | :"baz" | :baz |
+| literals/literals.rb:124:4:124:6 | :"foo" | :foo |
+| literals/literals.rb:124:8:124:10 | :"bar" | :bar |
+| literals/literals.rb:124:12:124:14 | :"baz" | :baz |
+| literals/literals.rb:125:4:125:6 | :"foo" | :foo |
+| literals/literals.rb:125:8:125:20 | :"bar#{...}" | :bar6 |
+| literals/literals.rb:125:14:125:14 | 2 | 2 |
+| literals/literals.rb:125:14:125:18 | ... + ... | 6 |
+| literals/literals.rb:125:18:125:18 | 4 | 4 |
+| literals/literals.rb:125:22:125:27 | :"#{...}" | :bar |
+| literals/literals.rb:125:24:125:26 | bar | bar |
+| literals/literals.rb:125:29:125:34 | :"#{...}" | :bar |
+| literals/literals.rb:125:31:125:33 | BAR | bar |
+| literals/literals.rb:125:36:125:38 | :"baz" | :baz |
+| literals/literals.rb:126:4:126:6 | :"foo" | :foo |
+| literals/literals.rb:126:8:126:12 | :"bar#{" | :bar#{ |
+| literals/literals.rb:126:14:126:14 | :"2" | :2 |
+| literals/literals.rb:126:16:126:16 | :"+" | :+ |
+| literals/literals.rb:126:18:126:18 | :"4" | :4 |
+| literals/literals.rb:126:20:126:20 | :"}" | :} |
+| literals/literals.rb:126:22:126:27 | :"#{bar}" | :#{bar} |
+| literals/literals.rb:126:29:126:34 | :"#{BAR}" | :#{BAR} |
+| literals/literals.rb:126:36:126:38 | :"baz" | :baz |
+| literals/literals.rb:130:3:130:5 | :foo | :foo |
+| literals/literals.rb:130:8:130:8 | 1 | 1 |
+| literals/literals.rb:130:11:130:14 | :bar | :bar |
+| literals/literals.rb:130:19:130:19 | 2 | 2 |
+| literals/literals.rb:130:22:130:26 | "baz" | baz |
+| literals/literals.rb:130:31:130:31 | 3 | 3 |
+| literals/literals.rb:131:3:131:5 | :foo | :foo |
+| literals/literals.rb:131:8:131:8 | 7 | 7 |
+| literals/literals.rb:134:2:134:2 | 1 | 1 |
+| literals/literals.rb:134:5:134:6 | 10 | 10 |
+| literals/literals.rb:135:2:135:2 | 1 | 1 |
+| literals/literals.rb:135:6:135:7 | 10 | 10 |
+| literals/literals.rb:136:2:136:2 | 1 | 1 |
+| literals/literals.rb:136:7:136:7 | 0 | 0 |
+| literals/literals.rb:137:9:137:9 | 2 | 2 |
+| literals/literals.rb:137:9:137:11 | ... + ... | 5 |
+| literals/literals.rb:137:11:137:11 | 3 | 3 |
+| literals/literals.rb:138:2:138:2 | 1 | 1 |
+| literals/literals.rb:139:4:139:4 | 1 | 1 |
+| literals/literals.rb:140:2:140:2 | 0 | 0 |
+| literals/literals.rb:140:6:140:6 | 1 | 1 |
+| literals/literals.rb:143:1:143:7 | `ls -l` | ls -l |
+| literals/literals.rb:144:1:144:9 | `ls -l` | ls -l |
+| literals/literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | du -d 2 bar bar |
+| literals/literals.rb:145:11:145:11 | 1 | 1 |
+| literals/literals.rb:145:11:145:15 | ... + ... | 2 |
+| literals/literals.rb:145:15:145:15 | 1 | 1 |
+| literals/literals.rb:145:21:145:23 | bar | bar |
+| literals/literals.rb:145:28:145:30 | BAR | bar |
+| literals/literals.rb:146:1:146:20 | `du -d #{...}` | du -d 1 |
+| literals/literals.rb:146:13:146:13 | 5 | 5 |
+| literals/literals.rb:146:13:146:17 | ... - ... | 1 |
+| literals/literals.rb:146:17:146:17 | 4 | 4 |
+| literals/literals.rb:149:1:149:2 | // |  |
+| literals/literals.rb:150:1:150:5 | /foo/ | foo |
+| literals/literals.rb:151:1:151:6 | /foo/ | foo |
+| literals/literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
+| literals/literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
+| literals/literals.rb:153:8:153:8 | 1 | 1 |
+| literals/literals.rb:153:8:153:12 | ... + ... | 2 |
+| literals/literals.rb:153:12:153:12 | 1 | 1 |
+| literals/literals.rb:153:20:153:22 | bar | bar |
+| literals/literals.rb:153:26:153:28 | BAR | bar |
+| literals/literals.rb:155:1:155:4 | // |  |
+| literals/literals.rb:156:1:156:7 | /foo/ | foo |
+| literals/literals.rb:157:1:157:8 | /foo/ | foo |
+| literals/literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
+| literals/literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
+| literals/literals.rb:159:10:159:10 | 1 | 1 |
+| literals/literals.rb:159:10:159:14 | ... + ... | 2 |
+| literals/literals.rb:159:14:159:14 | 1 | 1 |
+| literals/literals.rb:159:22:159:24 | bar | bar |
+| literals/literals.rb:159:28:159:30 | BAR | bar |
+| literals/literals.rb:163:1:163:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | abcdefghijklmnopqrstuvwxyzabcdef |
+| literals/literals.rb:164:1:164:35 | "foobarfoobarfoobarfoobarfooba..." | foobarfoobarfoobarfoobarfoobarfoo |
+| literals/literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | foobar\\foobar\\foobar\\foobar\\foobar |
+| literals/literals.rb:168:9:168:13 | <<SQL | \nselect * from table\n |
+| literals/literals.rb:175:11:175:16 | <<-BLA | \nsome text\nand some more\n   |
+| literals/literals.rb:180:9:180:19 | <<~SQUIGGLY | \n   indented stuff\n |
+| literals/literals.rb:193:10:193:19 | <<`SCRIPT` | \n cat file.txt\n |
+| literals/literals.rb:197:5:197:6 | 42 | 42 |
+| literals/literals.rb:198:2:198:2 | :x | :x |
+| literals/literals.rb:198:2:198:2 | x | 42 |
+| literals/literals.rb:198:6:198:6 | :y | :y |
+| literals/literals.rb:198:8:198:8 | 5 | 5 |
+| literals/literals.rb:199:2:199:2 | :y | :y |
+| literals/literals.rb:199:7:199:7 | :Z | :Z |
 | misc/misc.erb:2:15:2:37 | "main_include_admin.js" | main_include_admin.js |
 | misc/misc.rb:1:7:1:11 | "bar" | bar |
 | misc/misc.rb:3:7:3:9 | foo | foo |
@@ -610,7 +692,7 @@
 | misc/misc.rb:8:12:8:14 | []= | []= |
 | misc/misc.rb:9:7:9:11 | super | super |
 | misc/misc.rb:9:13:9:16 | self | self |
-| misc/misc.rb:10:7:10:17 | :"\\n#{...}" | :\\nbar |
+| misc/misc.rb:10:7:10:17 | :"\\n#{...}" | :\nbar |
 | misc/misc.rb:10:13:10:15 | bar | bar |
 | misc/misc.rb:10:19:10:24 | :"foo" | :foo |
 | modules/classes.rb:11:28:11:31 | :baz | :baz |
diff --git a/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.expected b/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.expected
new file mode 100644
index 00000000000..8b19b6a69b9
--- /dev/null
+++ b/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.expected
@@ -0,0 +1,130 @@
+stringEscapeSequenceComponents
+| escapes.rb:15:2:15:3 | \\' | \\' | ' |
+| escapes.rb:16:2:16:3 | \\" | \\" | " |
+| escapes.rb:17:2:17:3 | \\\\ | \\\\ | \\ |
+| escapes.rb:18:2:18:3 | \\1 | \\1 | \u0001 |
+| escapes.rb:19:2:19:3 | \\\\ | \\\\ | \\ |
+| escapes.rb:20:2:20:5 | \\141 | \\141 | a |
+| escapes.rb:21:2:21:5 | \\x6d | \\x6d | m |
+| escapes.rb:22:2:22:5 | \\x6E | \\x6E | n |
+| escapes.rb:23:2:23:3 | \\X | \\X | X |
+| escapes.rb:24:2:24:3 | \\X | \\X | X |
+| escapes.rb:25:2:25:7 | \\u203d | \\u203d | \u203d |
+| escapes.rb:26:2:26:7 | \\u{62} | \\u{62} | b |
+| escapes.rb:27:2:27:10 | \\u{1f60a} | \\u{1f60a} | \ud83d\ude0a |
+| escapes.rb:28:2:28:3 | \\a | \\a | \u0007 |
+| escapes.rb:29:2:29:3 | \\b | \\b | \u0008 |
+| escapes.rb:30:2:30:3 | \\t | \\t | \t |
+| escapes.rb:31:2:31:3 | \\n | \\n | \n |
+| escapes.rb:32:2:32:3 | \\v | \\v | \u000b |
+| escapes.rb:33:2:33:3 | \\f | \\f | \u000c |
+| escapes.rb:34:2:34:3 | \\r | \\r | \r |
+| escapes.rb:35:2:35:3 | \\e | \\e | \u001b |
+| escapes.rb:36:2:36:3 | \\s | \\s |   |
+| escapes.rb:37:2:37:3 | \\c | \\c | c |
+| escapes.rb:38:2:38:3 | \\C | \\C | C |
+| escapes.rb:43:6:43:7 | \\\\ | \\\\ | \\ |
+| escapes.rb:53:6:53:7 | \\\\ | \\\\ | \\ |
+| escapes.rb:58:7:58:9 |  \\n |  \\n | \\n |
+| escapes.rb:70:3:70:4 | \\' | \\' | ' |
+| escapes.rb:71:3:71:4 | \\" | \\" | " |
+| escapes.rb:72:3:72:4 | \\\\ | \\\\ | \\ |
+| escapes.rb:73:3:73:4 | \\1 | \\1 | \u0001 |
+| escapes.rb:74:3:74:4 | \\\\ | \\\\ | \\ |
+| escapes.rb:75:3:75:6 | \\141 | \\141 | a |
+| escapes.rb:76:3:76:6 | \\x6d | \\x6d | m |
+| escapes.rb:77:3:77:6 | \\x6E | \\x6E | n |
+| escapes.rb:78:3:78:4 | \\X | \\X | X |
+| escapes.rb:79:3:79:4 | \\X | \\X | X |
+| escapes.rb:80:3:80:8 | \\u203d | \\u203d | \u203d |
+| escapes.rb:81:3:81:8 | \\u{62} | \\u{62} | b |
+| escapes.rb:82:3:82:11 | \\u{1f60a} | \\u{1f60a} | \ud83d\ude0a |
+| escapes.rb:83:3:83:4 | \\a | \\a | \u0007 |
+| escapes.rb:84:3:84:4 | \\b | \\b | \u0008 |
+| escapes.rb:85:3:85:4 | \\t | \\t | \t |
+| escapes.rb:86:3:86:4 | \\n | \\n | \n |
+| escapes.rb:87:3:87:4 | \\v | \\v | \u000b |
+| escapes.rb:88:3:88:4 | \\f | \\f | \u000c |
+| escapes.rb:89:3:89:4 | \\r | \\r | \r |
+| escapes.rb:90:3:90:4 | \\e | \\e | \u001b |
+| escapes.rb:91:3:91:4 | \\s | \\s |   |
+| escapes.rb:92:3:92:4 | \\c | \\c | c |
+| escapes.rb:93:3:93:4 | \\C | \\C | C |
+regexpEscapeSequenceComponents
+| escapes.rb:48:2:48:3 | \\n | \\n |
+| escapes.rb:49:2:49:3 | \\p | \\p |
+| escapes.rb:50:2:50:7 | \\u0061 | \\u0061 |
+| escapes.rb:54:6:54:7 | \\. | \\. |
+stringlikeLiterals
+| escapes.rb:6:1:6:4 | "\\'" | ' | string |
+| escapes.rb:7:1:7:4 | "\\"" | \\" | string |
+| escapes.rb:8:1:8:4 | "\\\\" | \\ | string |
+| escapes.rb:9:1:9:4 | "\\1" | \\1 | string |
+| escapes.rb:10:1:10:5 | "\\\\1" | \\1 | string |
+| escapes.rb:11:1:11:6 | "\\141" | \\141 | string |
+| escapes.rb:12:1:12:4 | "\\n" | \\n | string |
+| escapes.rb:15:1:15:4 | "\\'" | ' | string |
+| escapes.rb:16:1:16:4 | "\\"" | " | string |
+| escapes.rb:17:1:17:4 | "\\\\" | \\ | string |
+| escapes.rb:18:1:18:4 | "\\1" | \u0001 | string |
+| escapes.rb:19:1:19:5 | "\\\\1" | \\1 | string |
+| escapes.rb:20:1:20:6 | "\\141" | a | string |
+| escapes.rb:21:1:21:6 | "\\x6d" | m | string |
+| escapes.rb:22:1:22:6 | "\\x6E" | n | string |
+| escapes.rb:23:1:23:6 | "\\X6d" | X6d | string |
+| escapes.rb:24:1:24:6 | "\\X6E" | X6E | string |
+| escapes.rb:25:1:25:8 | "\\u203d" | \u203d | string |
+| escapes.rb:26:1:26:8 | "\\u{62}" | b | string |
+| escapes.rb:27:1:27:11 | "\\u{1f60a}" | \ud83d\ude0a | string |
+| escapes.rb:28:1:28:4 | "\\a" | \u0007 | string |
+| escapes.rb:29:1:29:4 | "\\b" | \u0008 | string |
+| escapes.rb:30:1:30:4 | "\\t" | \t | string |
+| escapes.rb:31:1:31:4 | "\\n" | \n | string |
+| escapes.rb:32:1:32:4 | "\\v" | \u000b | string |
+| escapes.rb:33:1:33:4 | "\\f" | \u000c | string |
+| escapes.rb:34:1:34:4 | "\\r" | \r | string |
+| escapes.rb:35:1:35:4 | "\\e" | \u001b | string |
+| escapes.rb:36:1:36:4 | "\\s" |   | string |
+| escapes.rb:37:1:37:5 | "\\c?" | c? | string |
+| escapes.rb:38:1:38:6 | "\\C-?" | C-? | string |
+| escapes.rb:43:5:43:9 | "\\\\." | \\. | string |
+| escapes.rb:44:1:44:6 | "#{...}" | \\. | string |
+| escapes.rb:48:1:48:4 | /\\n/ | \\n | string |
+| escapes.rb:49:1:49:4 | /\\p/ | \\p | string |
+| escapes.rb:50:1:50:8 | /\\u0061/ | \\u0061 | string |
+| escapes.rb:53:5:53:9 | "\\\\." | \\. | string |
+| escapes.rb:54:5:54:8 | /\\./ | \\. | string |
+| escapes.rb:55:1:55:10 | /#{...}#{...}/ | \\.\\. | string |
+| escapes.rb:58:4:58:9 | "foo \\n" | foo\\n | string |
+| escapes.rb:58:11:58:13 | "bar" | bar | string |
+| escapes.rb:61:1:61:5 | :"\\'" | ' | symbol |
+| escapes.rb:62:1:62:5 | :"\\"" | \\" | symbol |
+| escapes.rb:63:1:63:5 | :"\\\\" | \\ | symbol |
+| escapes.rb:64:1:64:5 | :"\\1" | \\1 | symbol |
+| escapes.rb:65:1:65:6 | :"\\\\1" | \\1 | symbol |
+| escapes.rb:66:1:66:7 | :"\\141" | \\141 | symbol |
+| escapes.rb:67:1:67:5 | :"\\n" | \\n | symbol |
+| escapes.rb:70:1:70:5 | :"\\'" | ' | symbol |
+| escapes.rb:71:1:71:5 | :"\\"" | " | symbol |
+| escapes.rb:72:1:72:5 | :"\\\\" | \\ | symbol |
+| escapes.rb:73:1:73:5 | :"\\1" | \u0001 | symbol |
+| escapes.rb:74:1:74:6 | :"\\\\1" | \\1 | symbol |
+| escapes.rb:75:1:75:7 | :"\\141" | a | symbol |
+| escapes.rb:76:1:76:7 | :"\\x6d" | m | symbol |
+| escapes.rb:77:1:77:7 | :"\\x6E" | n | symbol |
+| escapes.rb:78:1:78:7 | :"\\X6d" | X6d | symbol |
+| escapes.rb:79:1:79:7 | :"\\X6E" | X6E | symbol |
+| escapes.rb:80:1:80:9 | :"\\u203d" | \u203d | symbol |
+| escapes.rb:81:1:81:9 | :"\\u{62}" | b | symbol |
+| escapes.rb:82:1:82:12 | :"\\u{1f60a}" | \ud83d\ude0a | symbol |
+| escapes.rb:83:1:83:5 | :"\\a" | \u0007 | symbol |
+| escapes.rb:84:1:84:5 | :"\\b" | \u0008 | symbol |
+| escapes.rb:85:1:85:5 | :"\\t" | \t | symbol |
+| escapes.rb:86:1:86:5 | :"\\n" | \n | symbol |
+| escapes.rb:87:1:87:5 | :"\\v" | \u000b | symbol |
+| escapes.rb:88:1:88:5 | :"\\f" | \u000c | symbol |
+| escapes.rb:89:1:89:5 | :"\\r" | \r | symbol |
+| escapes.rb:90:1:90:5 | :"\\e" | \u001b | symbol |
+| escapes.rb:91:1:91:5 | :"\\s" |   | symbol |
+| escapes.rb:92:1:92:6 | :"\\c?" | c? | symbol |
+| escapes.rb:93:1:93:7 | :"\\C-?" | C-? | symbol |
diff --git a/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql b/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql
new file mode 100644
index 00000000000..1b4660f8aff
--- /dev/null
+++ b/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql
@@ -0,0 +1,24 @@
+import ruby
+
+query predicate stringEscapeSequenceComponents(
+  StringEscapeSequenceComponent c, string raw, string unescaped
+) {
+  (
+    unescaped = c.getConstantValue().getString()
+    or
+    not exists(c.getConstantValue().getString()) and unescaped = "<none>"
+  ) and
+  raw = c.getRawText()
+}
+
+query predicate regexpEscapeSequenceComponents(RegExpEscapeSequenceComponent c, string stringValue) {
+  stringValue = c.getConstantValue().getString()
+  or
+  not exists(c.getConstantValue().getString()) and stringValue = "<none>"
+}
+
+query predicate stringlikeLiterals(StringlikeLiteral l, string value, string kind) {
+  value = l.getConstantValue().getString() and kind = "string"
+  or
+  value = l.getConstantValue().getSymbol() and kind = "symbol"
+}
diff --git a/ruby/ql/test/library-tests/ast/escape_sequences/escapes.rb b/ruby/ql/test/library-tests/ast/escape_sequences/escapes.rb
new file mode 100644
index 00000000000..d7d3e10f994
--- /dev/null
+++ b/ruby/ql/test/library-tests/ast/escape_sequences/escapes.rb
@@ -0,0 +1,93 @@
+# Most comments indicate the contents of the string after MRI has parsed the
+# escape sequences (i.e. what gets printed by `puts`), and that's what we expect
+# `getConstantValue().getString()` to return.
+
+# The only escapes in single-quoted strings are backslash and single-quote.
+'\''        # '
+'\"'        # \"
+'\\'        # \
+'\1'        # \1
+'\\1'       # \1
+'\141'      # \141
+'\n'        # \n
+
+# Double-quoted strings
+"\'"        # '
+"\""        # "
+"\\"        # \
+"\1"        # <U+0001>
+"\\1"       # \1
+"\141"      # a
+"\x6d"      # m
+"\x6E"      # n
+"\X6d"      # X6d
+"\X6E"      # X6E
+"\u203d"    # ‽
+"\u{62}"    # b
+"\u{1f60a}" # 😊 <Printed as \ud83d\ude0a by CodeQL>
+"\a"        # <bell U+0007>
+"\b"        # <backspace U+0008>
+"\t"        # <tab U+0009>
+"\n"        # <newline U+000A>
+"\v"        # <vertical tab U+000B>
+"\f"        # <form feed U+000C>
+"\r"        # <carriage return U+000D>
+"\e"        # <escape U+001B>
+"\s"        # <space U+0020>
+"\c?"       # <delete U+007F> problem: only \c is parsed as part of the escape sequence
+"\C-?"      # <delete U+007F> problem: only \C is parsed as part of the escape sequence
+
+# TODO: support/test more control characters: \M-..., \cx, \C-x, etc.
+
+# String interpolation
+a = "\\." # \.
+"#{a}"    # \.
+
+# Regexps - escape sequences are handled by the regex parser, so their constant
+# value should be interpreted literally and not unescaped as in double-quoted strings
+/\n/
+/\p/
+/\u0061/
+
+# Regexp interpolation
+a = "\\." # \.
+b = /\./
+/#{a}#{b}/  # equivalent to /\.\./
+
+# String arrays
+%w[foo \n bar] # should be equivalent to ["foo", "\\n", "bar"], but currently misparsed as ["foo \\n", "bar"]
+
+# Single-quoted symbols. Comments indicate the expected, unescaped string contents.
+:'\''    # '
+:'\"'    # \"
+:'\\'    # \
+:'\1'    # \1
+:'\\1'   # \1
+:'\141'  # \141
+:'\n'    # \n
+
+# Double-quoted symbols. Comments indicate the expected, unescaped string contents.
+:"\'"        # '
+:"\""        # "
+:"\\"        # \
+:"\1"        # <U+0001>
+:"\\1"       # \1
+:"\141"      # a
+:"\x6d"      # m
+:"\x6E"      # n
+:"\X6d"      # X6d
+:"\X6E"      # X6E
+:"\u203d"    # ‽
+:"\u{62}"    # b
+:"\u{1f60a}" # 😊 <Printed as \ud83d\ude0a by CodeQL>
+:"\a"        # <bell U+0007>
+:"\b"        # <backspace U+0008>
+:"\t"        # <tab U+0009>
+:"\n"        # <newline U+000A>
+:"\v"        # <vertical tab U+000B>
+:"\f"        # <form feed U+000C>
+:"\r"        # <carriage return U+000D>
+:"\e"        # <escape U+001B>
+:"\s"        # <space U+0020>
+:"\c?"       # <delete U+007F> problem: only \c is parsed as part of the escape sequence
+:"\C-?"      # <delete U+007F> problem: only \C is parsed as part of the escape sequence
diff --git a/ruby/ql/test/library-tests/ast/literals/literals.expected b/ruby/ql/test/library-tests/ast/literals/literals.expected
index 9d1ffd61587..99d96a27506 100644
--- a/ruby/ql/test/library-tests/ast/literals/literals.expected
+++ b/ruby/ql/test/library-tests/ast/literals/literals.expected
@@ -9,898 +9,937 @@ allLiterals
 | literals.rb:11:1:11:5 | 5_678 | IntegerLiteral | 5678 |
 | literals.rb:12:1:12:1 | 0 | IntegerLiteral | 0 |
 | literals.rb:13:1:13:5 | 0d900 | IntegerLiteral | 0 |
-| literals.rb:16:1:16:6 | 0x1234 | IntegerLiteral | 4660 |
-| literals.rb:17:1:17:10 | 0xdeadbeef | IntegerLiteral | -559038737 |
-| literals.rb:18:1:18:11 | 0xF00D_face | IntegerLiteral | -267519282 |
-| literals.rb:21:1:21:4 | 0123 | IntegerLiteral | 83 |
-| literals.rb:22:1:22:5 | 0o234 | IntegerLiteral | 156 |
-| literals.rb:23:1:23:6 | 0O45_6 | IntegerLiteral | 302 |
-| literals.rb:26:1:26:10 | 0b10010100 | IntegerLiteral | 148 |
-| literals.rb:27:1:27:11 | 0B011_01101 | IntegerLiteral | 109 |
-| literals.rb:30:1:30:5 | 12.34 | FloatLiteral | 12.34 |
-| literals.rb:31:1:31:7 | 1234e-2 | FloatLiteral | 12.34 |
-| literals.rb:32:1:32:7 | 1.234E1 | FloatLiteral | 12.34 |
-| literals.rb:35:1:35:3 | 23r | RationalLiteral | 23/1 |
-| literals.rb:36:1:36:5 | 9.85r | RationalLiteral | 985/100 |
-| literals.rb:39:1:39:2 | 2i | ComplexLiteral | 0+2i |
-| literals.rb:46:1:46:2 | "" | StringLiteral |  |
-| literals.rb:47:1:47:2 | "" | StringLiteral |  |
-| literals.rb:48:1:48:7 | "hello" | StringLiteral | hello |
-| literals.rb:49:1:49:9 | "goodbye" | StringLiteral | goodbye |
-| literals.rb:50:1:50:30 | "string with escaped \\" quote" | StringLiteral | string with escaped \\" quote |
-| literals.rb:51:1:51:21 | "string with " quote" | StringLiteral | string with " quote |
-| literals.rb:52:1:52:14 | "foo bar baz" | StringLiteral | foo bar baz |
-| literals.rb:53:1:53:15 | "foo bar baz" | StringLiteral | foo bar baz |
-| literals.rb:54:1:54:20 | "foo ' bar " baz'" | StringLiteral | foo ' bar " baz' |
-| literals.rb:55:1:55:20 | "FOO ' BAR " BAZ'" | StringLiteral | FOO ' BAR " BAZ' |
-| literals.rb:56:1:56:12 | "foo\\ bar" | StringLiteral | foo\\ bar |
-| literals.rb:57:1:57:12 | "foo\\ bar" | StringLiteral | foo\\ bar |
-| literals.rb:58:1:58:20 | "2 + 2 = #{...}" | StringLiteral | 2 + 2 = 4 |
-| literals.rb:58:13:58:13 | 2 | IntegerLiteral | 2 |
-| literals.rb:58:17:58:17 | 2 | IntegerLiteral | 2 |
-| literals.rb:59:1:59:22 | "3 + 4 = #{...}" | StringLiteral | 3 + 4 = 7 |
-| literals.rb:59:15:59:15 | 3 | IntegerLiteral | 3 |
-| literals.rb:59:19:59:19 | 4 | IntegerLiteral | 4 |
-| literals.rb:60:1:60:20 | "2 + 2 = #{ 2 + 2 }" | StringLiteral | 2 + 2 = #{ 2 + 2 } |
-| literals.rb:61:1:61:22 | "3 + 4 = #{ 3 + 4 }" | StringLiteral | 3 + 4 = #{ 3 + 4 } |
-| literals.rb:62:1:62:5 | "foo" | StringLiteral | foo |
-| literals.rb:62:7:62:11 | "bar" | StringLiteral | bar |
-| literals.rb:62:13:62:17 | "baz" | StringLiteral | baz |
-| literals.rb:63:1:63:7 | "foo" | StringLiteral | foo |
-| literals.rb:63:9:63:13 | "bar" | StringLiteral | bar |
-| literals.rb:63:15:63:19 | "baz" | StringLiteral | baz |
-| literals.rb:64:1:64:5 | "foo" | StringLiteral | foo |
-| literals.rb:64:7:64:21 | "bar#{...}" | StringLiteral | bar1 |
-| literals.rb:64:14:64:14 | 1 | IntegerLiteral | 1 |
-| literals.rb:64:18:64:18 | 1 | IntegerLiteral | 1 |
-| literals.rb:64:23:64:27 | "baz" | StringLiteral | baz |
-| literals.rb:65:1:65:35 | "foo #{...} qux" | StringLiteral | foo bar 5 baz qux |
-| literals.rb:65:9:65:28 | "bar #{...} baz" | StringLiteral | bar 5 baz |
-| literals.rb:65:17:65:17 | 2 | IntegerLiteral | 2 |
-| literals.rb:65:21:65:21 | 3 | IntegerLiteral | 3 |
-| literals.rb:66:1:66:22 | "foo #{...}" | StringLiteral | foo 10 |
-| literals.rb:66:17:66:17 | 1 | IntegerLiteral | 1 |
-| literals.rb:66:19:66:19 | 9 | IntegerLiteral | 9 |
-| literals.rb:67:7:67:11 | "bar" | StringLiteral | bar |
-| literals.rb:68:7:68:11 | "bar" | StringLiteral | bar |
-| literals.rb:69:1:69:14 | "foo #{...}" | StringLiteral | foo bar |
-| literals.rb:70:1:70:14 | "foo #{...}" | StringLiteral | foo bar |
-| literals.rb:73:1:73:2 | ?x | CharacterLiteral | ?x |
-| literals.rb:74:1:74:3 | ?\\n | CharacterLiteral | ?\\n |
-| literals.rb:75:1:75:3 | ?\\s | CharacterLiteral | ?\\s |
-| literals.rb:76:1:76:3 | ?\\\\ | CharacterLiteral | ?\\\\ |
-| literals.rb:77:1:77:7 | ?\\u{58} | CharacterLiteral | ?\\u{58} |
-| literals.rb:78:1:78:5 | ?\\C-a | CharacterLiteral | ?\\C-a |
-| literals.rb:79:1:79:5 | ?\\M-a | CharacterLiteral | ?\\M-a |
-| literals.rb:80:1:80:8 | ?\\M-\\C-a | CharacterLiteral | ?\\M-\\C-a |
-| literals.rb:81:1:81:8 | ?\\C-\\M-a | CharacterLiteral | ?\\C-\\M-a |
-| literals.rb:84:1:84:3 | :"" | SymbolLiteral | : |
-| literals.rb:85:1:85:6 | :hello | SymbolLiteral | :hello |
-| literals.rb:86:1:86:10 | :"foo bar" | SymbolLiteral | :foo bar |
-| literals.rb:87:1:87:10 | :"bar baz" | SymbolLiteral | :bar baz |
-| literals.rb:88:1:88:14 | {...} | HashLiteral | <none> |
-| literals.rb:88:3:88:5 | :foo | SymbolLiteral | :foo |
-| literals.rb:88:8:88:12 | "bar" | StringLiteral | bar |
-| literals.rb:89:1:89:10 | :"wibble" | SymbolLiteral | :wibble |
-| literals.rb:90:1:90:17 | :"wibble wobble" | SymbolLiteral | :wibble wobble |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | :foo_4_bar_bar |
-| literals.rb:91:10:91:10 | 2 | IntegerLiteral | 2 |
-| literals.rb:91:14:91:14 | 2 | IntegerLiteral | 2 |
-| literals.rb:92:1:92:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | SymbolLiteral | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
-| literals.rb:93:1:93:18 | :"foo_#{ 3 - 2 }" | SymbolLiteral | :foo_#{ 3 - 2 } |
-| literals.rb:96:1:96:2 | [...] | ArrayLiteral | <none> |
-| literals.rb:97:1:97:9 | [...] | ArrayLiteral | <none> |
-| literals.rb:97:2:97:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:97:5:97:5 | 2 | IntegerLiteral | 2 |
-| literals.rb:97:8:97:8 | 3 | IntegerLiteral | 3 |
-| literals.rb:98:1:98:14 | [...] | ArrayLiteral | <none> |
-| literals.rb:98:2:98:2 | 4 | IntegerLiteral | 4 |
-| literals.rb:98:5:98:5 | 5 | IntegerLiteral | 5 |
-| literals.rb:98:8:98:9 | 12 | IntegerLiteral | 12 |
-| literals.rb:98:13:98:13 | 2 | IntegerLiteral | 2 |
-| literals.rb:99:1:99:11 | [...] | ArrayLiteral | <none> |
-| literals.rb:99:2:99:2 | 7 | IntegerLiteral | 7 |
-| literals.rb:99:5:99:10 | [...] | ArrayLiteral | <none> |
-| literals.rb:99:6:99:6 | 8 | IntegerLiteral | 8 |
-| literals.rb:99:9:99:9 | 9 | IntegerLiteral | 9 |
-| literals.rb:102:1:102:4 | %w(...) | ArrayLiteral | <none> |
-| literals.rb:103:1:103:15 | %w(...) | ArrayLiteral | <none> |
-| literals.rb:103:4:103:6 | "foo" | StringLiteral | foo |
-| literals.rb:103:8:103:10 | "bar" | StringLiteral | bar |
-| literals.rb:103:12:103:14 | "baz" | StringLiteral | baz |
-| literals.rb:104:1:104:15 | %w(...) | ArrayLiteral | <none> |
-| literals.rb:104:4:104:6 | "foo" | StringLiteral | foo |
-| literals.rb:104:8:104:10 | "bar" | StringLiteral | bar |
-| literals.rb:104:12:104:14 | "baz" | StringLiteral | baz |
-| literals.rb:105:1:105:35 | %w(...) | ArrayLiteral | <none> |
-| literals.rb:105:4:105:6 | "foo" | StringLiteral | foo |
-| literals.rb:105:8:105:16 | "bar#{...}" | StringLiteral | bar2 |
-| literals.rb:105:13:105:13 | 1 | IntegerLiteral | 1 |
-| literals.rb:105:15:105:15 | 1 | IntegerLiteral | 1 |
-| literals.rb:105:18:105:23 | "#{...}" | StringLiteral | bar |
-| literals.rb:105:25:105:30 | "#{...}" | StringLiteral | bar |
-| literals.rb:105:32:105:34 | "baz" | StringLiteral | baz |
-| literals.rb:106:1:106:35 | %w(...) | ArrayLiteral | <none> |
-| literals.rb:106:4:106:6 | "foo" | StringLiteral | foo |
-| literals.rb:106:8:106:16 | "bar#{1+1}" | StringLiteral | bar#{1+1} |
-| literals.rb:106:18:106:23 | "#{bar}" | StringLiteral | #{bar} |
-| literals.rb:106:25:106:30 | "#{BAR}" | StringLiteral | #{BAR} |
-| literals.rb:106:32:106:34 | "baz" | StringLiteral | baz |
-| literals.rb:109:1:109:4 | %i(...) | ArrayLiteral | <none> |
-| literals.rb:110:1:110:15 | %i(...) | ArrayLiteral | <none> |
-| literals.rb:110:4:110:6 | :"foo" | SymbolLiteral | :foo |
-| literals.rb:110:8:110:10 | :"bar" | SymbolLiteral | :bar |
-| literals.rb:110:12:110:14 | :"baz" | SymbolLiteral | :baz |
-| literals.rb:111:1:111:15 | %i(...) | ArrayLiteral | <none> |
-| literals.rb:111:4:111:6 | :"foo" | SymbolLiteral | :foo |
-| literals.rb:111:8:111:10 | :"bar" | SymbolLiteral | :bar |
-| literals.rb:111:12:111:14 | :"baz" | SymbolLiteral | :baz |
-| literals.rb:112:1:112:39 | %i(...) | ArrayLiteral | <none> |
-| literals.rb:112:4:112:6 | :"foo" | SymbolLiteral | :foo |
-| literals.rb:112:8:112:20 | :"bar#{...}" | SymbolLiteral | :bar6 |
-| literals.rb:112:14:112:14 | 2 | IntegerLiteral | 2 |
-| literals.rb:112:18:112:18 | 4 | IntegerLiteral | 4 |
-| literals.rb:112:22:112:27 | :"#{...}" | SymbolLiteral | :bar |
-| literals.rb:112:29:112:34 | :"#{...}" | SymbolLiteral | :bar |
-| literals.rb:112:36:112:38 | :"baz" | SymbolLiteral | :baz |
-| literals.rb:113:1:113:39 | %i(...) | ArrayLiteral | <none> |
-| literals.rb:113:4:113:6 | :"foo" | SymbolLiteral | :foo |
-| literals.rb:113:8:113:12 | :"bar#{" | SymbolLiteral | :bar#{ |
-| literals.rb:113:14:113:14 | :"2" | SymbolLiteral | :2 |
-| literals.rb:113:16:113:16 | :"+" | SymbolLiteral | :+ |
-| literals.rb:113:18:113:18 | :"4" | SymbolLiteral | :4 |
-| literals.rb:113:20:113:20 | :"}" | SymbolLiteral | :} |
-| literals.rb:113:22:113:27 | :"#{bar}" | SymbolLiteral | :#{bar} |
-| literals.rb:113:29:113:34 | :"#{BAR}" | SymbolLiteral | :#{BAR} |
-| literals.rb:113:36:113:38 | :"baz" | SymbolLiteral | :baz |
-| literals.rb:116:1:116:2 | {...} | HashLiteral | <none> |
-| literals.rb:117:1:117:33 | {...} | HashLiteral | <none> |
-| literals.rb:117:3:117:5 | :foo | SymbolLiteral | :foo |
-| literals.rb:117:8:117:8 | 1 | IntegerLiteral | 1 |
-| literals.rb:117:11:117:14 | :bar | SymbolLiteral | :bar |
-| literals.rb:117:19:117:19 | 2 | IntegerLiteral | 2 |
-| literals.rb:117:22:117:26 | "baz" | StringLiteral | baz |
-| literals.rb:117:31:117:31 | 3 | IntegerLiteral | 3 |
-| literals.rb:118:1:118:17 | {...} | HashLiteral | <none> |
-| literals.rb:118:3:118:5 | :foo | SymbolLiteral | :foo |
-| literals.rb:118:8:118:8 | 7 | IntegerLiteral | 7 |
-| literals.rb:121:2:121:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:121:2:121:6 | _ .. _ | RangeLiteral | <none> |
-| literals.rb:121:5:121:6 | 10 | IntegerLiteral | 10 |
-| literals.rb:122:2:122:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:122:2:122:7 | _ ... _ | RangeLiteral | <none> |
-| literals.rb:122:6:122:7 | 10 | IntegerLiteral | 10 |
-| literals.rb:123:2:123:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:123:2:123:7 | _ .. _ | RangeLiteral | <none> |
-| literals.rb:123:7:123:7 | 0 | IntegerLiteral | 0 |
-| literals.rb:124:2:124:11 | _ .. _ | RangeLiteral | <none> |
-| literals.rb:124:9:124:9 | 2 | IntegerLiteral | 2 |
-| literals.rb:124:11:124:11 | 3 | IntegerLiteral | 3 |
-| literals.rb:125:2:125:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:125:2:125:4 | _ .. _ | RangeLiteral | <none> |
-| literals.rb:126:2:126:4 | _ .. _ | RangeLiteral | <none> |
-| literals.rb:126:4:126:4 | 1 | IntegerLiteral | 1 |
-| literals.rb:127:2:127:2 | 0 | IntegerLiteral | 0 |
-| literals.rb:127:2:127:4 | _ .. _ | RangeLiteral | <none> |
-| literals.rb:127:6:127:6 | 1 | IntegerLiteral | 1 |
-| literals.rb:130:1:130:7 | `ls -l` | SubshellLiteral | ls -l |
-| literals.rb:131:1:131:9 | `ls -l` | SubshellLiteral | ls -l |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | du -d 2 bar bar |
-| literals.rb:132:11:132:11 | 1 | IntegerLiteral | 1 |
-| literals.rb:132:15:132:15 | 1 | IntegerLiteral | 1 |
-| literals.rb:133:1:133:20 | `du -d #{...}` | SubshellLiteral | du -d 1 |
-| literals.rb:133:13:133:13 | 5 | IntegerLiteral | 5 |
-| literals.rb:133:17:133:17 | 4 | IntegerLiteral | 4 |
-| literals.rb:136:1:136:2 | // | RegExpLiteral |  |
-| literals.rb:137:1:137:5 | /foo/ | RegExpLiteral | foo |
-| literals.rb:138:1:138:6 | /foo/ | RegExpLiteral | foo |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | RegExpLiteral | foo+\\sbar\\S |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | foo2barbarbar |
-| literals.rb:140:8:140:8 | 1 | IntegerLiteral | 1 |
-| literals.rb:140:12:140:12 | 1 | IntegerLiteral | 1 |
-| literals.rb:141:1:141:8 | /foo/ | RegExpLiteral | <none> |
-| literals.rb:142:1:142:4 | // | RegExpLiteral |  |
-| literals.rb:143:1:143:7 | /foo/ | RegExpLiteral | foo |
-| literals.rb:144:1:144:8 | /foo/ | RegExpLiteral | foo |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | RegExpLiteral | foo+\\sbar\\S |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | foo2barbarbar |
-| literals.rb:146:10:146:10 | 1 | IntegerLiteral | 1 |
-| literals.rb:146:14:146:14 | 1 | IntegerLiteral | 1 |
-| literals.rb:147:1:147:10 | /foo/ | RegExpLiteral | <none> |
-| literals.rb:150:1:150:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | StringLiteral | abcdefghijklmnopqrstuvwxyzabcdef |
-| literals.rb:151:1:151:35 | "foobarfoobarfoobarfoobarfooba..." | StringLiteral | foobarfoobarfoobarfoobarfoobarfoo |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | foobar\\\\foobar\\\\foobar\\\\foobar\\\\foobar |
-| literals.rb:155:9:155:13 | <<SQL | HereDoc | \nselect * from table\n |
-| literals.rb:155:16:155:20 | <<SQL | HereDoc | <none> |
-| literals.rb:162:11:162:16 | <<-BLA | HereDoc | \nsome text\\nand some more\n   |
-| literals.rb:167:9:167:19 | <<~SQUIGGLY | HereDoc | \n   indented stuff\n |
-| literals.rb:171:9:171:15 | <<"DOC" | HereDoc | <none> |
-| literals.rb:176:9:176:15 | <<'DOC' | HereDoc | <none> |
-| literals.rb:180:10:180:19 | <<`SCRIPT` | HereDoc | \n cat file.txt\n |
-| literals.rb:184:5:184:6 | 42 | IntegerLiteral | 42 |
-| literals.rb:185:1:185:9 | {...} | HashLiteral | <none> |
-| literals.rb:185:2:185:2 | :x | SymbolLiteral | :x |
-| literals.rb:185:6:185:6 | :y | SymbolLiteral | :y |
-| literals.rb:185:8:185:8 | 5 | IntegerLiteral | 5 |
-| literals.rb:186:1:186:9 | {...} | HashLiteral | <none> |
-| literals.rb:186:2:186:2 | :y | SymbolLiteral | :y |
-| literals.rb:186:7:186:7 | :Z | SymbolLiteral | :Z |
+| literals.rb:14:1:14:10 | 2147483647 | IntegerLiteral | 2147483647 |
+| literals.rb:15:1:15:10 | 2147483648 | IntegerLiteral | <none> |
+| literals.rb:18:1:18:6 | 0x1234 | IntegerLiteral | 4660 |
+| literals.rb:19:1:19:6 | 0xbeef | IntegerLiteral | 48879 |
+| literals.rb:20:1:20:7 | 0xF0_0D | IntegerLiteral | 61453 |
+| literals.rb:21:1:21:22 | 0x000000000000000000ff | IntegerLiteral | 255 |
+| literals.rb:22:1:22:11 | 0x7FFF_FFFF | IntegerLiteral | 2147483647 |
+| literals.rb:23:1:23:10 | 0x80000000 | IntegerLiteral | <none> |
+| literals.rb:24:1:24:10 | 0xdeadbeef | IntegerLiteral | <none> |
+| literals.rb:25:1:25:11 | 0xF00D_face | IntegerLiteral | <none> |
+| literals.rb:28:1:28:4 | 0123 | IntegerLiteral | 83 |
+| literals.rb:29:1:29:5 | 0o234 | IntegerLiteral | 156 |
+| literals.rb:30:1:30:6 | 0O45_6 | IntegerLiteral | 302 |
+| literals.rb:31:1:31:31 | 0000000000000000000000000000010 | IntegerLiteral | 8 |
+| literals.rb:32:1:32:12 | 017777777777 | IntegerLiteral | 2147483647 |
+| literals.rb:33:1:33:12 | 020000000000 | IntegerLiteral | <none> |
+| literals.rb:36:1:36:10 | 0b10010100 | IntegerLiteral | 148 |
+| literals.rb:37:1:37:11 | 0B011_01101 | IntegerLiteral | 109 |
+| literals.rb:38:1:38:43 | 0b00000000000000000000000000000000000000011 | IntegerLiteral | 3 |
+| literals.rb:39:1:39:34 | 0b01111111111111111111111111111111 | IntegerLiteral | 2147483647 |
+| literals.rb:40:1:40:34 | 0b10000000000000000000000000000000 | IntegerLiteral | <none> |
+| literals.rb:43:1:43:5 | 12.34 | FloatLiteral | 12.34 |
+| literals.rb:44:1:44:7 | 1234e-2 | FloatLiteral | 12.34 |
+| literals.rb:45:1:45:7 | 1.234E1 | FloatLiteral | 12.34 |
+| literals.rb:48:1:48:3 | 23r | RationalLiteral | 23/1 |
+| literals.rb:49:1:49:5 | 9.85r | RationalLiteral | 985/100 |
+| literals.rb:52:1:52:2 | 2i | ComplexLiteral | 0+2i |
+| literals.rb:59:1:59:2 | "" | StringLiteral |  |
+| literals.rb:60:1:60:2 | "" | StringLiteral |  |
+| literals.rb:61:1:61:7 | "hello" | StringLiteral | hello |
+| literals.rb:62:1:62:9 | "goodbye" | StringLiteral | goodbye |
+| literals.rb:63:1:63:30 | "string with escaped \\" quote" | StringLiteral | string with escaped " quote |
+| literals.rb:64:1:64:21 | "string with " quote" | StringLiteral | string with " quote |
+| literals.rb:65:1:65:14 | "foo bar baz" | StringLiteral | foo bar baz |
+| literals.rb:66:1:66:15 | "foo bar baz" | StringLiteral | foo bar baz |
+| literals.rb:67:1:67:20 | "foo ' bar " baz'" | StringLiteral | foo ' bar " baz' |
+| literals.rb:68:1:68:20 | "FOO ' BAR " BAZ'" | StringLiteral | FOO ' BAR " BAZ' |
+| literals.rb:69:1:69:12 | "foo\\ bar" | StringLiteral | foo\\ bar |
+| literals.rb:70:1:70:12 | "foo\\ bar" | StringLiteral | foo bar |
+| literals.rb:71:1:71:20 | "2 + 2 = #{...}" | StringLiteral | 2 + 2 = 4 |
+| literals.rb:71:13:71:13 | 2 | IntegerLiteral | 2 |
+| literals.rb:71:17:71:17 | 2 | IntegerLiteral | 2 |
+| literals.rb:72:1:72:22 | "3 + 4 = #{...}" | StringLiteral | 3 + 4 = 7 |
+| literals.rb:72:15:72:15 | 3 | IntegerLiteral | 3 |
+| literals.rb:72:19:72:19 | 4 | IntegerLiteral | 4 |
+| literals.rb:73:1:73:20 | "2 + 2 = #{ 2 + 2 }" | StringLiteral | 2 + 2 = #{ 2 + 2 } |
+| literals.rb:74:1:74:22 | "3 + 4 = #{ 3 + 4 }" | StringLiteral | 3 + 4 = #{ 3 + 4 } |
+| literals.rb:75:1:75:5 | "foo" | StringLiteral | foo |
+| literals.rb:75:7:75:11 | "bar" | StringLiteral | bar |
+| literals.rb:75:13:75:17 | "baz" | StringLiteral | baz |
+| literals.rb:76:1:76:7 | "foo" | StringLiteral | foo |
+| literals.rb:76:9:76:13 | "bar" | StringLiteral | bar |
+| literals.rb:76:15:76:19 | "baz" | StringLiteral | baz |
+| literals.rb:77:1:77:5 | "foo" | StringLiteral | foo |
+| literals.rb:77:7:77:21 | "bar#{...}" | StringLiteral | bar1 |
+| literals.rb:77:14:77:14 | 1 | IntegerLiteral | 1 |
+| literals.rb:77:18:77:18 | 1 | IntegerLiteral | 1 |
+| literals.rb:77:23:77:27 | "baz" | StringLiteral | baz |
+| literals.rb:78:1:78:35 | "foo #{...} qux" | StringLiteral | foo bar 5 baz qux |
+| literals.rb:78:9:78:28 | "bar #{...} baz" | StringLiteral | bar 5 baz |
+| literals.rb:78:17:78:17 | 2 | IntegerLiteral | 2 |
+| literals.rb:78:21:78:21 | 3 | IntegerLiteral | 3 |
+| literals.rb:79:1:79:22 | "foo #{...}" | StringLiteral | foo 10 |
+| literals.rb:79:17:79:17 | 1 | IntegerLiteral | 1 |
+| literals.rb:79:19:79:19 | 9 | IntegerLiteral | 9 |
+| literals.rb:80:7:80:11 | "bar" | StringLiteral | bar |
+| literals.rb:81:7:81:11 | "bar" | StringLiteral | bar |
+| literals.rb:82:1:82:14 | "foo #{...}" | StringLiteral | foo bar |
+| literals.rb:83:1:83:14 | "foo #{...}" | StringLiteral | foo bar |
+| literals.rb:86:1:86:2 | ?x | CharacterLiteral | ?x |
+| literals.rb:87:1:87:3 | ?\\n | CharacterLiteral | ?\\n |
+| literals.rb:88:1:88:3 | ?\\s | CharacterLiteral | ?\\s |
+| literals.rb:89:1:89:3 | ?\\\\ | CharacterLiteral | ?\\\\ |
+| literals.rb:90:1:90:7 | ?\\u{58} | CharacterLiteral | ?\\u{58} |
+| literals.rb:91:1:91:5 | ?\\C-a | CharacterLiteral | ?\\C-a |
+| literals.rb:92:1:92:5 | ?\\M-a | CharacterLiteral | ?\\M-a |
+| literals.rb:93:1:93:8 | ?\\M-\\C-a | CharacterLiteral | ?\\M-\\C-a |
+| literals.rb:94:1:94:8 | ?\\C-\\M-a | CharacterLiteral | ?\\C-\\M-a |
+| literals.rb:97:1:97:3 | :"" | SymbolLiteral | : |
+| literals.rb:98:1:98:6 | :hello | SymbolLiteral | :hello |
+| literals.rb:99:1:99:10 | :"foo bar" | SymbolLiteral | :foo bar |
+| literals.rb:100:1:100:10 | :"bar baz" | SymbolLiteral | :bar baz |
+| literals.rb:101:1:101:14 | {...} | HashLiteral | <none> |
+| literals.rb:101:3:101:5 | :foo | SymbolLiteral | :foo |
+| literals.rb:101:8:101:12 | "bar" | StringLiteral | bar |
+| literals.rb:102:1:102:10 | :"wibble" | SymbolLiteral | :wibble |
+| literals.rb:103:1:103:17 | :"wibble wobble" | SymbolLiteral | :wibble wobble |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | :foo_4_bar_bar |
+| literals.rb:104:10:104:10 | 2 | IntegerLiteral | 2 |
+| literals.rb:104:14:104:14 | 2 | IntegerLiteral | 2 |
+| literals.rb:105:1:105:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | SymbolLiteral | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
+| literals.rb:106:1:106:18 | :"foo_#{ 3 - 2 }" | SymbolLiteral | :foo_#{ 3 - 2 } |
+| literals.rb:109:1:109:2 | [...] | ArrayLiteral | <none> |
+| literals.rb:110:1:110:9 | [...] | ArrayLiteral | <none> |
+| literals.rb:110:2:110:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:110:5:110:5 | 2 | IntegerLiteral | 2 |
+| literals.rb:110:8:110:8 | 3 | IntegerLiteral | 3 |
+| literals.rb:111:1:111:14 | [...] | ArrayLiteral | <none> |
+| literals.rb:111:2:111:2 | 4 | IntegerLiteral | 4 |
+| literals.rb:111:5:111:5 | 5 | IntegerLiteral | 5 |
+| literals.rb:111:8:111:9 | 12 | IntegerLiteral | 12 |
+| literals.rb:111:13:111:13 | 2 | IntegerLiteral | 2 |
+| literals.rb:112:1:112:11 | [...] | ArrayLiteral | <none> |
+| literals.rb:112:2:112:2 | 7 | IntegerLiteral | 7 |
+| literals.rb:112:5:112:10 | [...] | ArrayLiteral | <none> |
+| literals.rb:112:6:112:6 | 8 | IntegerLiteral | 8 |
+| literals.rb:112:9:112:9 | 9 | IntegerLiteral | 9 |
+| literals.rb:115:1:115:4 | %w(...) | ArrayLiteral | <none> |
+| literals.rb:116:1:116:15 | %w(...) | ArrayLiteral | <none> |
+| literals.rb:116:4:116:6 | "foo" | StringLiteral | foo |
+| literals.rb:116:8:116:10 | "bar" | StringLiteral | bar |
+| literals.rb:116:12:116:14 | "baz" | StringLiteral | baz |
+| literals.rb:117:1:117:15 | %w(...) | ArrayLiteral | <none> |
+| literals.rb:117:4:117:6 | "foo" | StringLiteral | foo |
+| literals.rb:117:8:117:10 | "bar" | StringLiteral | bar |
+| literals.rb:117:12:117:14 | "baz" | StringLiteral | baz |
+| literals.rb:118:1:118:35 | %w(...) | ArrayLiteral | <none> |
+| literals.rb:118:4:118:6 | "foo" | StringLiteral | foo |
+| literals.rb:118:8:118:16 | "bar#{...}" | StringLiteral | bar2 |
+| literals.rb:118:13:118:13 | 1 | IntegerLiteral | 1 |
+| literals.rb:118:15:118:15 | 1 | IntegerLiteral | 1 |
+| literals.rb:118:18:118:23 | "#{...}" | StringLiteral | bar |
+| literals.rb:118:25:118:30 | "#{...}" | StringLiteral | bar |
+| literals.rb:118:32:118:34 | "baz" | StringLiteral | baz |
+| literals.rb:119:1:119:35 | %w(...) | ArrayLiteral | <none> |
+| literals.rb:119:4:119:6 | "foo" | StringLiteral | foo |
+| literals.rb:119:8:119:16 | "bar#{1+1}" | StringLiteral | bar#{1+1} |
+| literals.rb:119:18:119:23 | "#{bar}" | StringLiteral | #{bar} |
+| literals.rb:119:25:119:30 | "#{BAR}" | StringLiteral | #{BAR} |
+| literals.rb:119:32:119:34 | "baz" | StringLiteral | baz |
+| literals.rb:122:1:122:4 | %i(...) | ArrayLiteral | <none> |
+| literals.rb:123:1:123:15 | %i(...) | ArrayLiteral | <none> |
+| literals.rb:123:4:123:6 | :"foo" | SymbolLiteral | :foo |
+| literals.rb:123:8:123:10 | :"bar" | SymbolLiteral | :bar |
+| literals.rb:123:12:123:14 | :"baz" | SymbolLiteral | :baz |
+| literals.rb:124:1:124:15 | %i(...) | ArrayLiteral | <none> |
+| literals.rb:124:4:124:6 | :"foo" | SymbolLiteral | :foo |
+| literals.rb:124:8:124:10 | :"bar" | SymbolLiteral | :bar |
+| literals.rb:124:12:124:14 | :"baz" | SymbolLiteral | :baz |
+| literals.rb:125:1:125:39 | %i(...) | ArrayLiteral | <none> |
+| literals.rb:125:4:125:6 | :"foo" | SymbolLiteral | :foo |
+| literals.rb:125:8:125:20 | :"bar#{...}" | SymbolLiteral | :bar6 |
+| literals.rb:125:14:125:14 | 2 | IntegerLiteral | 2 |
+| literals.rb:125:18:125:18 | 4 | IntegerLiteral | 4 |
+| literals.rb:125:22:125:27 | :"#{...}" | SymbolLiteral | :bar |
+| literals.rb:125:29:125:34 | :"#{...}" | SymbolLiteral | :bar |
+| literals.rb:125:36:125:38 | :"baz" | SymbolLiteral | :baz |
+| literals.rb:126:1:126:39 | %i(...) | ArrayLiteral | <none> |
+| literals.rb:126:4:126:6 | :"foo" | SymbolLiteral | :foo |
+| literals.rb:126:8:126:12 | :"bar#{" | SymbolLiteral | :bar#{ |
+| literals.rb:126:14:126:14 | :"2" | SymbolLiteral | :2 |
+| literals.rb:126:16:126:16 | :"+" | SymbolLiteral | :+ |
+| literals.rb:126:18:126:18 | :"4" | SymbolLiteral | :4 |
+| literals.rb:126:20:126:20 | :"}" | SymbolLiteral | :} |
+| literals.rb:126:22:126:27 | :"#{bar}" | SymbolLiteral | :#{bar} |
+| literals.rb:126:29:126:34 | :"#{BAR}" | SymbolLiteral | :#{BAR} |
+| literals.rb:126:36:126:38 | :"baz" | SymbolLiteral | :baz |
+| literals.rb:129:1:129:2 | {...} | HashLiteral | <none> |
+| literals.rb:130:1:130:33 | {...} | HashLiteral | <none> |
+| literals.rb:130:3:130:5 | :foo | SymbolLiteral | :foo |
+| literals.rb:130:8:130:8 | 1 | IntegerLiteral | 1 |
+| literals.rb:130:11:130:14 | :bar | SymbolLiteral | :bar |
+| literals.rb:130:19:130:19 | 2 | IntegerLiteral | 2 |
+| literals.rb:130:22:130:26 | "baz" | StringLiteral | baz |
+| literals.rb:130:31:130:31 | 3 | IntegerLiteral | 3 |
+| literals.rb:131:1:131:17 | {...} | HashLiteral | <none> |
+| literals.rb:131:3:131:5 | :foo | SymbolLiteral | :foo |
+| literals.rb:131:8:131:8 | 7 | IntegerLiteral | 7 |
+| literals.rb:134:2:134:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:134:2:134:6 | _ .. _ | RangeLiteral | <none> |
+| literals.rb:134:5:134:6 | 10 | IntegerLiteral | 10 |
+| literals.rb:135:2:135:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:135:2:135:7 | _ ... _ | RangeLiteral | <none> |
+| literals.rb:135:6:135:7 | 10 | IntegerLiteral | 10 |
+| literals.rb:136:2:136:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:136:2:136:7 | _ .. _ | RangeLiteral | <none> |
+| literals.rb:136:7:136:7 | 0 | IntegerLiteral | 0 |
+| literals.rb:137:2:137:11 | _ .. _ | RangeLiteral | <none> |
+| literals.rb:137:9:137:9 | 2 | IntegerLiteral | 2 |
+| literals.rb:137:11:137:11 | 3 | IntegerLiteral | 3 |
+| literals.rb:138:2:138:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:138:2:138:4 | _ .. _ | RangeLiteral | <none> |
+| literals.rb:139:2:139:4 | _ .. _ | RangeLiteral | <none> |
+| literals.rb:139:4:139:4 | 1 | IntegerLiteral | 1 |
+| literals.rb:140:2:140:2 | 0 | IntegerLiteral | 0 |
+| literals.rb:140:2:140:4 | _ .. _ | RangeLiteral | <none> |
+| literals.rb:140:6:140:6 | 1 | IntegerLiteral | 1 |
+| literals.rb:143:1:143:7 | `ls -l` | SubshellLiteral | ls -l |
+| literals.rb:144:1:144:9 | `ls -l` | SubshellLiteral | ls -l |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | du -d 2 bar bar |
+| literals.rb:145:11:145:11 | 1 | IntegerLiteral | 1 |
+| literals.rb:145:15:145:15 | 1 | IntegerLiteral | 1 |
+| literals.rb:146:1:146:20 | `du -d #{...}` | SubshellLiteral | du -d 1 |
+| literals.rb:146:13:146:13 | 5 | IntegerLiteral | 5 |
+| literals.rb:146:17:146:17 | 4 | IntegerLiteral | 4 |
+| literals.rb:149:1:149:2 | // | RegExpLiteral |  |
+| literals.rb:150:1:150:5 | /foo/ | RegExpLiteral | foo |
+| literals.rb:151:1:151:6 | /foo/ | RegExpLiteral | foo |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | RegExpLiteral | foo+\\sbar\\S |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | foo2barbarbar |
+| literals.rb:153:8:153:8 | 1 | IntegerLiteral | 1 |
+| literals.rb:153:12:153:12 | 1 | IntegerLiteral | 1 |
+| literals.rb:154:1:154:8 | /foo/ | RegExpLiteral | <none> |
+| literals.rb:155:1:155:4 | // | RegExpLiteral |  |
+| literals.rb:156:1:156:7 | /foo/ | RegExpLiteral | foo |
+| literals.rb:157:1:157:8 | /foo/ | RegExpLiteral | foo |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | RegExpLiteral | foo+\\sbar\\S |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | foo2barbarbar |
+| literals.rb:159:10:159:10 | 1 | IntegerLiteral | 1 |
+| literals.rb:159:14:159:14 | 1 | IntegerLiteral | 1 |
+| literals.rb:160:1:160:10 | /foo/ | RegExpLiteral | <none> |
+| literals.rb:163:1:163:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | StringLiteral | abcdefghijklmnopqrstuvwxyzabcdef |
+| literals.rb:164:1:164:35 | "foobarfoobarfoobarfoobarfooba..." | StringLiteral | foobarfoobarfoobarfoobarfoobarfoo |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | foobar\\foobar\\foobar\\foobar\\foobar |
+| literals.rb:168:9:168:13 | <<SQL | HereDoc | \nselect * from table\n |
+| literals.rb:168:16:168:20 | <<SQL | HereDoc | <none> |
+| literals.rb:175:11:175:16 | <<-BLA | HereDoc | \nsome text\nand some more\n   |
+| literals.rb:180:9:180:19 | <<~SQUIGGLY | HereDoc | \n   indented stuff\n |
+| literals.rb:184:9:184:15 | <<"DOC" | HereDoc | <none> |
+| literals.rb:189:9:189:15 | <<'DOC' | HereDoc | <none> |
+| literals.rb:193:10:193:19 | <<`SCRIPT` | HereDoc | \n cat file.txt\n |
+| literals.rb:197:5:197:6 | 42 | IntegerLiteral | 42 |
+| literals.rb:198:1:198:9 | {...} | HashLiteral | <none> |
+| literals.rb:198:2:198:2 | :x | SymbolLiteral | :x |
+| literals.rb:198:6:198:6 | :y | SymbolLiteral | :y |
+| literals.rb:198:8:198:8 | 5 | IntegerLiteral | 5 |
+| literals.rb:199:1:199:9 | {...} | HashLiteral | <none> |
+| literals.rb:199:2:199:2 | :y | SymbolLiteral | :y |
+| literals.rb:199:7:199:7 | :Z | SymbolLiteral | :Z |
 stringlikeLiterals
-| literals.rb:46:1:46:2 | "" |  |
-| literals.rb:47:1:47:2 | "" |  |
-| literals.rb:48:1:48:7 | "hello" | hello |
-| literals.rb:49:1:49:9 | "goodbye" | goodbye |
-| literals.rb:50:1:50:30 | "string with escaped \\" quote" | string with escaped \\" quote |
-| literals.rb:51:1:51:21 | "string with " quote" | string with " quote |
-| literals.rb:52:1:52:14 | "foo bar baz" | foo bar baz |
-| literals.rb:53:1:53:15 | "foo bar baz" | foo bar baz |
-| literals.rb:54:1:54:20 | "foo ' bar " baz'" | foo ' bar " baz' |
-| literals.rb:55:1:55:20 | "FOO ' BAR " BAZ'" | FOO ' BAR " BAZ' |
-| literals.rb:56:1:56:12 | "foo\\ bar" | foo\\ bar |
-| literals.rb:57:1:57:12 | "foo\\ bar" | foo\\ bar |
-| literals.rb:58:1:58:20 | "2 + 2 = #{...}" | 2 + 2 = 4 |
-| literals.rb:59:1:59:22 | "3 + 4 = #{...}" | 3 + 4 = 7 |
-| literals.rb:60:1:60:20 | "2 + 2 = #{ 2 + 2 }" | 2 + 2 = #{ 2 + 2 } |
-| literals.rb:61:1:61:22 | "3 + 4 = #{ 3 + 4 }" | 3 + 4 = #{ 3 + 4 } |
-| literals.rb:62:1:62:5 | "foo" | foo |
-| literals.rb:62:7:62:11 | "bar" | bar |
-| literals.rb:62:13:62:17 | "baz" | baz |
-| literals.rb:63:1:63:7 | "foo" | foo |
-| literals.rb:63:9:63:13 | "bar" | bar |
-| literals.rb:63:15:63:19 | "baz" | baz |
-| literals.rb:64:1:64:5 | "foo" | foo |
-| literals.rb:64:7:64:21 | "bar#{...}" | bar1 |
-| literals.rb:64:23:64:27 | "baz" | baz |
-| literals.rb:65:1:65:35 | "foo #{...} qux" | foo bar 5 baz qux |
-| literals.rb:65:9:65:28 | "bar #{...} baz" | bar 5 baz |
-| literals.rb:66:1:66:22 | "foo #{...}" | foo 10 |
-| literals.rb:67:7:67:11 | "bar" | bar |
-| literals.rb:68:7:68:11 | "bar" | bar |
-| literals.rb:69:1:69:14 | "foo #{...}" | foo bar |
-| literals.rb:70:1:70:14 | "foo #{...}" | foo bar |
-| literals.rb:84:1:84:3 | :"" | : |
-| literals.rb:85:1:85:6 | :hello | :hello |
-| literals.rb:86:1:86:10 | :"foo bar" | :foo bar |
-| literals.rb:87:1:87:10 | :"bar baz" | :bar baz |
-| literals.rb:88:3:88:5 | :foo | :foo |
-| literals.rb:88:8:88:12 | "bar" | bar |
-| literals.rb:89:1:89:10 | :"wibble" | :wibble |
-| literals.rb:90:1:90:17 | :"wibble wobble" | :wibble wobble |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | :foo_4_bar_bar |
-| literals.rb:92:1:92:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
-| literals.rb:93:1:93:18 | :"foo_#{ 3 - 2 }" | :foo_#{ 3 - 2 } |
-| literals.rb:103:4:103:6 | "foo" | foo |
-| literals.rb:103:8:103:10 | "bar" | bar |
-| literals.rb:103:12:103:14 | "baz" | baz |
-| literals.rb:104:4:104:6 | "foo" | foo |
-| literals.rb:104:8:104:10 | "bar" | bar |
-| literals.rb:104:12:104:14 | "baz" | baz |
-| literals.rb:105:4:105:6 | "foo" | foo |
-| literals.rb:105:8:105:16 | "bar#{...}" | bar2 |
-| literals.rb:105:18:105:23 | "#{...}" | bar |
-| literals.rb:105:25:105:30 | "#{...}" | bar |
-| literals.rb:105:32:105:34 | "baz" | baz |
-| literals.rb:106:4:106:6 | "foo" | foo |
-| literals.rb:106:8:106:16 | "bar#{1+1}" | bar#{1+1} |
-| literals.rb:106:18:106:23 | "#{bar}" | #{bar} |
-| literals.rb:106:25:106:30 | "#{BAR}" | #{BAR} |
-| literals.rb:106:32:106:34 | "baz" | baz |
-| literals.rb:110:4:110:6 | :"foo" | :foo |
-| literals.rb:110:8:110:10 | :"bar" | :bar |
-| literals.rb:110:12:110:14 | :"baz" | :baz |
-| literals.rb:111:4:111:6 | :"foo" | :foo |
-| literals.rb:111:8:111:10 | :"bar" | :bar |
-| literals.rb:111:12:111:14 | :"baz" | :baz |
-| literals.rb:112:4:112:6 | :"foo" | :foo |
-| literals.rb:112:8:112:20 | :"bar#{...}" | :bar6 |
-| literals.rb:112:22:112:27 | :"#{...}" | :bar |
-| literals.rb:112:29:112:34 | :"#{...}" | :bar |
-| literals.rb:112:36:112:38 | :"baz" | :baz |
-| literals.rb:113:4:113:6 | :"foo" | :foo |
-| literals.rb:113:8:113:12 | :"bar#{" | :bar#{ |
-| literals.rb:113:14:113:14 | :"2" | :2 |
-| literals.rb:113:16:113:16 | :"+" | :+ |
-| literals.rb:113:18:113:18 | :"4" | :4 |
-| literals.rb:113:20:113:20 | :"}" | :} |
-| literals.rb:113:22:113:27 | :"#{bar}" | :#{bar} |
-| literals.rb:113:29:113:34 | :"#{BAR}" | :#{BAR} |
-| literals.rb:113:36:113:38 | :"baz" | :baz |
-| literals.rb:117:3:117:5 | :foo | :foo |
-| literals.rb:117:11:117:14 | :bar | :bar |
-| literals.rb:117:22:117:26 | "baz" | baz |
-| literals.rb:118:3:118:5 | :foo | :foo |
-| literals.rb:130:1:130:7 | `ls -l` | ls -l |
-| literals.rb:131:1:131:9 | `ls -l` | ls -l |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | du -d 2 bar bar |
-| literals.rb:133:1:133:20 | `du -d #{...}` | du -d 1 |
-| literals.rb:136:1:136:2 | // |  |
-| literals.rb:137:1:137:5 | /foo/ | foo |
-| literals.rb:138:1:138:6 | /foo/ | foo |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
-| literals.rb:141:1:141:8 | /foo/ | <none> |
-| literals.rb:142:1:142:4 | // |  |
-| literals.rb:143:1:143:7 | /foo/ | foo |
-| literals.rb:144:1:144:8 | /foo/ | foo |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
-| literals.rb:147:1:147:10 | /foo/ | <none> |
-| literals.rb:150:1:150:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | abcdefghijklmnopqrstuvwxyzabcdef |
-| literals.rb:151:1:151:35 | "foobarfoobarfoobarfoobarfooba..." | foobarfoobarfoobarfoobarfoobarfoo |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | foobar\\\\foobar\\\\foobar\\\\foobar\\\\foobar |
-| literals.rb:155:9:155:13 | <<SQL | \nselect * from table\n |
-| literals.rb:155:16:155:20 | <<SQL | <none> |
-| literals.rb:162:11:162:16 | <<-BLA | \nsome text\\nand some more\n   |
-| literals.rb:167:9:167:19 | <<~SQUIGGLY | \n   indented stuff\n |
-| literals.rb:171:9:171:15 | <<"DOC" | <none> |
-| literals.rb:176:9:176:15 | <<'DOC' | <none> |
-| literals.rb:180:10:180:19 | <<`SCRIPT` | \n cat file.txt\n |
-| literals.rb:185:2:185:2 | :x | :x |
-| literals.rb:185:6:185:6 | :y | :y |
-| literals.rb:186:2:186:2 | :y | :y |
-| literals.rb:186:7:186:7 | :Z | :Z |
+| literals.rb:59:1:59:2 | "" |  |
+| literals.rb:60:1:60:2 | "" |  |
+| literals.rb:61:1:61:7 | "hello" | hello |
+| literals.rb:62:1:62:9 | "goodbye" | goodbye |
+| literals.rb:63:1:63:30 | "string with escaped \\" quote" | string with escaped " quote |
+| literals.rb:64:1:64:21 | "string with " quote" | string with " quote |
+| literals.rb:65:1:65:14 | "foo bar baz" | foo bar baz |
+| literals.rb:66:1:66:15 | "foo bar baz" | foo bar baz |
+| literals.rb:67:1:67:20 | "foo ' bar " baz'" | foo ' bar " baz' |
+| literals.rb:68:1:68:20 | "FOO ' BAR " BAZ'" | FOO ' BAR " BAZ' |
+| literals.rb:69:1:69:12 | "foo\\ bar" | foo\\ bar |
+| literals.rb:70:1:70:12 | "foo\\ bar" | foo bar |
+| literals.rb:71:1:71:20 | "2 + 2 = #{...}" | 2 + 2 = 4 |
+| literals.rb:72:1:72:22 | "3 + 4 = #{...}" | 3 + 4 = 7 |
+| literals.rb:73:1:73:20 | "2 + 2 = #{ 2 + 2 }" | 2 + 2 = #{ 2 + 2 } |
+| literals.rb:74:1:74:22 | "3 + 4 = #{ 3 + 4 }" | 3 + 4 = #{ 3 + 4 } |
+| literals.rb:75:1:75:5 | "foo" | foo |
+| literals.rb:75:7:75:11 | "bar" | bar |
+| literals.rb:75:13:75:17 | "baz" | baz |
+| literals.rb:76:1:76:7 | "foo" | foo |
+| literals.rb:76:9:76:13 | "bar" | bar |
+| literals.rb:76:15:76:19 | "baz" | baz |
+| literals.rb:77:1:77:5 | "foo" | foo |
+| literals.rb:77:7:77:21 | "bar#{...}" | bar1 |
+| literals.rb:77:23:77:27 | "baz" | baz |
+| literals.rb:78:1:78:35 | "foo #{...} qux" | foo bar 5 baz qux |
+| literals.rb:78:9:78:28 | "bar #{...} baz" | bar 5 baz |
+| literals.rb:79:1:79:22 | "foo #{...}" | foo 10 |
+| literals.rb:80:7:80:11 | "bar" | bar |
+| literals.rb:81:7:81:11 | "bar" | bar |
+| literals.rb:82:1:82:14 | "foo #{...}" | foo bar |
+| literals.rb:83:1:83:14 | "foo #{...}" | foo bar |
+| literals.rb:97:1:97:3 | :"" | : |
+| literals.rb:98:1:98:6 | :hello | :hello |
+| literals.rb:99:1:99:10 | :"foo bar" | :foo bar |
+| literals.rb:100:1:100:10 | :"bar baz" | :bar baz |
+| literals.rb:101:3:101:5 | :foo | :foo |
+| literals.rb:101:8:101:12 | "bar" | bar |
+| literals.rb:102:1:102:10 | :"wibble" | :wibble |
+| literals.rb:103:1:103:17 | :"wibble wobble" | :wibble wobble |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | :foo_4_bar_bar |
+| literals.rb:105:1:105:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
+| literals.rb:106:1:106:18 | :"foo_#{ 3 - 2 }" | :foo_#{ 3 - 2 } |
+| literals.rb:116:4:116:6 | "foo" | foo |
+| literals.rb:116:8:116:10 | "bar" | bar |
+| literals.rb:116:12:116:14 | "baz" | baz |
+| literals.rb:117:4:117:6 | "foo" | foo |
+| literals.rb:117:8:117:10 | "bar" | bar |
+| literals.rb:117:12:117:14 | "baz" | baz |
+| literals.rb:118:4:118:6 | "foo" | foo |
+| literals.rb:118:8:118:16 | "bar#{...}" | bar2 |
+| literals.rb:118:18:118:23 | "#{...}" | bar |
+| literals.rb:118:25:118:30 | "#{...}" | bar |
+| literals.rb:118:32:118:34 | "baz" | baz |
+| literals.rb:119:4:119:6 | "foo" | foo |
+| literals.rb:119:8:119:16 | "bar#{1+1}" | bar#{1+1} |
+| literals.rb:119:18:119:23 | "#{bar}" | #{bar} |
+| literals.rb:119:25:119:30 | "#{BAR}" | #{BAR} |
+| literals.rb:119:32:119:34 | "baz" | baz |
+| literals.rb:123:4:123:6 | :"foo" | :foo |
+| literals.rb:123:8:123:10 | :"bar" | :bar |
+| literals.rb:123:12:123:14 | :"baz" | :baz |
+| literals.rb:124:4:124:6 | :"foo" | :foo |
+| literals.rb:124:8:124:10 | :"bar" | :bar |
+| literals.rb:124:12:124:14 | :"baz" | :baz |
+| literals.rb:125:4:125:6 | :"foo" | :foo |
+| literals.rb:125:8:125:20 | :"bar#{...}" | :bar6 |
+| literals.rb:125:22:125:27 | :"#{...}" | :bar |
+| literals.rb:125:29:125:34 | :"#{...}" | :bar |
+| literals.rb:125:36:125:38 | :"baz" | :baz |
+| literals.rb:126:4:126:6 | :"foo" | :foo |
+| literals.rb:126:8:126:12 | :"bar#{" | :bar#{ |
+| literals.rb:126:14:126:14 | :"2" | :2 |
+| literals.rb:126:16:126:16 | :"+" | :+ |
+| literals.rb:126:18:126:18 | :"4" | :4 |
+| literals.rb:126:20:126:20 | :"}" | :} |
+| literals.rb:126:22:126:27 | :"#{bar}" | :#{bar} |
+| literals.rb:126:29:126:34 | :"#{BAR}" | :#{BAR} |
+| literals.rb:126:36:126:38 | :"baz" | :baz |
+| literals.rb:130:3:130:5 | :foo | :foo |
+| literals.rb:130:11:130:14 | :bar | :bar |
+| literals.rb:130:22:130:26 | "baz" | baz |
+| literals.rb:131:3:131:5 | :foo | :foo |
+| literals.rb:143:1:143:7 | `ls -l` | ls -l |
+| literals.rb:144:1:144:9 | `ls -l` | ls -l |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | du -d 2 bar bar |
+| literals.rb:146:1:146:20 | `du -d #{...}` | du -d 1 |
+| literals.rb:149:1:149:2 | // |  |
+| literals.rb:150:1:150:5 | /foo/ | foo |
+| literals.rb:151:1:151:6 | /foo/ | foo |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
+| literals.rb:154:1:154:8 | /foo/ | <none> |
+| literals.rb:155:1:155:4 | // |  |
+| literals.rb:156:1:156:7 | /foo/ | foo |
+| literals.rb:157:1:157:8 | /foo/ | foo |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | foo+\\sbar\\S |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |
+| literals.rb:160:1:160:10 | /foo/ | <none> |
+| literals.rb:163:1:163:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | abcdefghijklmnopqrstuvwxyzabcdef |
+| literals.rb:164:1:164:35 | "foobarfoobarfoobarfoobarfooba..." | foobarfoobarfoobarfoobarfoobarfoo |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | foobar\\foobar\\foobar\\foobar\\foobar |
+| literals.rb:168:9:168:13 | <<SQL | \nselect * from table\n |
+| literals.rb:168:16:168:20 | <<SQL | <none> |
+| literals.rb:175:11:175:16 | <<-BLA | \nsome text\nand some more\n   |
+| literals.rb:180:9:180:19 | <<~SQUIGGLY | \n   indented stuff\n |
+| literals.rb:184:9:184:15 | <<"DOC" | <none> |
+| literals.rb:189:9:189:15 | <<'DOC' | <none> |
+| literals.rb:193:10:193:19 | <<`SCRIPT` | \n cat file.txt\n |
+| literals.rb:198:2:198:2 | :x | :x |
+| literals.rb:198:6:198:6 | :y | :y |
+| literals.rb:199:2:199:2 | :y | :y |
+| literals.rb:199:7:199:7 | :Z | :Z |
 stringLiterals
-| literals.rb:46:1:46:2 | "" |  |
-| literals.rb:47:1:47:2 | "" |  |
-| literals.rb:48:1:48:7 | "hello" | hello |
-| literals.rb:49:1:49:9 | "goodbye" | goodbye |
-| literals.rb:50:1:50:30 | "string with escaped \\" quote" | string with escaped \\" quote |
-| literals.rb:51:1:51:21 | "string with " quote" | string with " quote |
-| literals.rb:52:1:52:14 | "foo bar baz" | foo bar baz |
-| literals.rb:53:1:53:15 | "foo bar baz" | foo bar baz |
-| literals.rb:54:1:54:20 | "foo ' bar " baz'" | foo ' bar " baz' |
-| literals.rb:55:1:55:20 | "FOO ' BAR " BAZ'" | FOO ' BAR " BAZ' |
-| literals.rb:56:1:56:12 | "foo\\ bar" | foo\\ bar |
-| literals.rb:57:1:57:12 | "foo\\ bar" | foo\\ bar |
-| literals.rb:58:1:58:20 | "2 + 2 = #{...}" | 2 + 2 = 4 |
-| literals.rb:59:1:59:22 | "3 + 4 = #{...}" | 3 + 4 = 7 |
-| literals.rb:60:1:60:20 | "2 + 2 = #{ 2 + 2 }" | 2 + 2 = #{ 2 + 2 } |
-| literals.rb:61:1:61:22 | "3 + 4 = #{ 3 + 4 }" | 3 + 4 = #{ 3 + 4 } |
-| literals.rb:62:1:62:5 | "foo" | foo |
-| literals.rb:62:7:62:11 | "bar" | bar |
-| literals.rb:62:13:62:17 | "baz" | baz |
-| literals.rb:63:1:63:7 | "foo" | foo |
-| literals.rb:63:9:63:13 | "bar" | bar |
-| literals.rb:63:15:63:19 | "baz" | baz |
-| literals.rb:64:1:64:5 | "foo" | foo |
-| literals.rb:64:7:64:21 | "bar#{...}" | bar1 |
-| literals.rb:64:23:64:27 | "baz" | baz |
-| literals.rb:65:1:65:35 | "foo #{...} qux" | foo bar 5 baz qux |
-| literals.rb:65:9:65:28 | "bar #{...} baz" | bar 5 baz |
-| literals.rb:66:1:66:22 | "foo #{...}" | foo 10 |
-| literals.rb:67:7:67:11 | "bar" | bar |
-| literals.rb:68:7:68:11 | "bar" | bar |
-| literals.rb:69:1:69:14 | "foo #{...}" | foo bar |
-| literals.rb:70:1:70:14 | "foo #{...}" | foo bar |
-| literals.rb:88:8:88:12 | "bar" | bar |
-| literals.rb:103:4:103:6 | "foo" | foo |
-| literals.rb:103:8:103:10 | "bar" | bar |
-| literals.rb:103:12:103:14 | "baz" | baz |
-| literals.rb:104:4:104:6 | "foo" | foo |
-| literals.rb:104:8:104:10 | "bar" | bar |
-| literals.rb:104:12:104:14 | "baz" | baz |
-| literals.rb:105:4:105:6 | "foo" | foo |
-| literals.rb:105:8:105:16 | "bar#{...}" | bar2 |
-| literals.rb:105:18:105:23 | "#{...}" | bar |
-| literals.rb:105:25:105:30 | "#{...}" | bar |
-| literals.rb:105:32:105:34 | "baz" | baz |
-| literals.rb:106:4:106:6 | "foo" | foo |
-| literals.rb:106:8:106:16 | "bar#{1+1}" | bar#{1+1} |
-| literals.rb:106:18:106:23 | "#{bar}" | #{bar} |
-| literals.rb:106:25:106:30 | "#{BAR}" | #{BAR} |
-| literals.rb:106:32:106:34 | "baz" | baz |
-| literals.rb:117:22:117:26 | "baz" | baz |
-| literals.rb:150:1:150:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | abcdefghijklmnopqrstuvwxyzabcdef |
-| literals.rb:151:1:151:35 | "foobarfoobarfoobarfoobarfooba..." | foobarfoobarfoobarfoobarfoobarfoo |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | foobar\\\\foobar\\\\foobar\\\\foobar\\\\foobar |
+| literals.rb:59:1:59:2 | "" |  |
+| literals.rb:60:1:60:2 | "" |  |
+| literals.rb:61:1:61:7 | "hello" | hello |
+| literals.rb:62:1:62:9 | "goodbye" | goodbye |
+| literals.rb:63:1:63:30 | "string with escaped \\" quote" | string with escaped " quote |
+| literals.rb:64:1:64:21 | "string with " quote" | string with " quote |
+| literals.rb:65:1:65:14 | "foo bar baz" | foo bar baz |
+| literals.rb:66:1:66:15 | "foo bar baz" | foo bar baz |
+| literals.rb:67:1:67:20 | "foo ' bar " baz'" | foo ' bar " baz' |
+| literals.rb:68:1:68:20 | "FOO ' BAR " BAZ'" | FOO ' BAR " BAZ' |
+| literals.rb:69:1:69:12 | "foo\\ bar" | foo\\ bar |
+| literals.rb:70:1:70:12 | "foo\\ bar" | foo bar |
+| literals.rb:71:1:71:20 | "2 + 2 = #{...}" | 2 + 2 = 4 |
+| literals.rb:72:1:72:22 | "3 + 4 = #{...}" | 3 + 4 = 7 |
+| literals.rb:73:1:73:20 | "2 + 2 = #{ 2 + 2 }" | 2 + 2 = #{ 2 + 2 } |
+| literals.rb:74:1:74:22 | "3 + 4 = #{ 3 + 4 }" | 3 + 4 = #{ 3 + 4 } |
+| literals.rb:75:1:75:5 | "foo" | foo |
+| literals.rb:75:7:75:11 | "bar" | bar |
+| literals.rb:75:13:75:17 | "baz" | baz |
+| literals.rb:76:1:76:7 | "foo" | foo |
+| literals.rb:76:9:76:13 | "bar" | bar |
+| literals.rb:76:15:76:19 | "baz" | baz |
+| literals.rb:77:1:77:5 | "foo" | foo |
+| literals.rb:77:7:77:21 | "bar#{...}" | bar1 |
+| literals.rb:77:23:77:27 | "baz" | baz |
+| literals.rb:78:1:78:35 | "foo #{...} qux" | foo bar 5 baz qux |
+| literals.rb:78:9:78:28 | "bar #{...} baz" | bar 5 baz |
+| literals.rb:79:1:79:22 | "foo #{...}" | foo 10 |
+| literals.rb:80:7:80:11 | "bar" | bar |
+| literals.rb:81:7:81:11 | "bar" | bar |
+| literals.rb:82:1:82:14 | "foo #{...}" | foo bar |
+| literals.rb:83:1:83:14 | "foo #{...}" | foo bar |
+| literals.rb:101:8:101:12 | "bar" | bar |
+| literals.rb:116:4:116:6 | "foo" | foo |
+| literals.rb:116:8:116:10 | "bar" | bar |
+| literals.rb:116:12:116:14 | "baz" | baz |
+| literals.rb:117:4:117:6 | "foo" | foo |
+| literals.rb:117:8:117:10 | "bar" | bar |
+| literals.rb:117:12:117:14 | "baz" | baz |
+| literals.rb:118:4:118:6 | "foo" | foo |
+| literals.rb:118:8:118:16 | "bar#{...}" | bar2 |
+| literals.rb:118:18:118:23 | "#{...}" | bar |
+| literals.rb:118:25:118:30 | "#{...}" | bar |
+| literals.rb:118:32:118:34 | "baz" | baz |
+| literals.rb:119:4:119:6 | "foo" | foo |
+| literals.rb:119:8:119:16 | "bar#{1+1}" | bar#{1+1} |
+| literals.rb:119:18:119:23 | "#{bar}" | #{bar} |
+| literals.rb:119:25:119:30 | "#{BAR}" | #{BAR} |
+| literals.rb:119:32:119:34 | "baz" | baz |
+| literals.rb:130:22:130:26 | "baz" | baz |
+| literals.rb:163:1:163:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | abcdefghijklmnopqrstuvwxyzabcdef |
+| literals.rb:164:1:164:35 | "foobarfoobarfoobarfoobarfooba..." | foobarfoobarfoobarfoobarfoobarfoo |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | foobar\\foobar\\foobar\\foobar\\foobar |
 regExpLiterals
-| literals.rb:136:1:136:2 | // |  |  |
-| literals.rb:137:1:137:5 | /foo/ | foo |  |
-| literals.rb:138:1:138:6 | /foo/ | foo | i |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | foo+\\sbar\\S |  |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |  |
-| literals.rb:141:1:141:8 | /foo/ | <none> | oxm |
-| literals.rb:142:1:142:4 | // |  |  |
-| literals.rb:143:1:143:7 | /foo/ | foo |  |
-| literals.rb:144:1:144:8 | /foo/ | foo | i |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | foo+\\sbar\\S |  |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |  |
-| literals.rb:147:1:147:10 | /foo/ | <none> | mxo |
+| literals.rb:149:1:149:2 | // |  |  |
+| literals.rb:150:1:150:5 | /foo/ | foo |  |
+| literals.rb:151:1:151:6 | /foo/ | foo | i |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | foo+\\sbar\\S |  |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |  |
+| literals.rb:154:1:154:8 | /foo/ | <none> | oxm |
+| literals.rb:155:1:155:4 | // |  |  |
+| literals.rb:156:1:156:7 | /foo/ | foo |  |
+| literals.rb:157:1:157:8 | /foo/ | foo | i |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | foo+\\sbar\\S |  |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | foo2barbarbar |  |
+| literals.rb:160:1:160:10 | /foo/ | <none> | mxo |
 regExpInterpolations
-| literals.rb:140:5:140:14 | #{...} | 0 | literals.rb:140:8:140:12 | ... + ... | AddExpr |
-| literals.rb:140:18:140:23 | #{...} | 0 | literals.rb:140:20:140:22 | bar | LocalVariableAccess |
-| literals.rb:140:24:140:29 | #{...} | 0 | literals.rb:140:26:140:28 | BAR | ConstantReadAccess |
-| literals.rb:146:7:146:16 | #{...} | 0 | literals.rb:146:10:146:14 | ... + ... | AddExpr |
-| literals.rb:146:20:146:25 | #{...} | 0 | literals.rb:146:22:146:24 | bar | LocalVariableAccess |
-| literals.rb:146:26:146:31 | #{...} | 0 | literals.rb:146:28:146:30 | BAR | ConstantReadAccess |
+| literals.rb:153:5:153:14 | #{...} | 0 | literals.rb:153:8:153:12 | ... + ... | AddExpr |
+| literals.rb:153:18:153:23 | #{...} | 0 | literals.rb:153:20:153:22 | bar | LocalVariableAccess |
+| literals.rb:153:24:153:29 | #{...} | 0 | literals.rb:153:26:153:28 | BAR | ConstantReadAccess |
+| literals.rb:159:7:159:16 | #{...} | 0 | literals.rb:159:10:159:14 | ... + ... | AddExpr |
+| literals.rb:159:20:159:25 | #{...} | 0 | literals.rb:159:22:159:24 | bar | LocalVariableAccess |
+| literals.rb:159:26:159:31 | #{...} | 0 | literals.rb:159:28:159:30 | BAR | ConstantReadAccess |
 symbolLiterals
-| literals.rb:84:1:84:3 | :"" | : |
-| literals.rb:85:1:85:6 | :hello | :hello |
-| literals.rb:86:1:86:10 | :"foo bar" | :foo bar |
-| literals.rb:87:1:87:10 | :"bar baz" | :bar baz |
-| literals.rb:88:3:88:5 | :foo | :foo |
-| literals.rb:89:1:89:10 | :"wibble" | :wibble |
-| literals.rb:90:1:90:17 | :"wibble wobble" | :wibble wobble |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | :foo_4_bar_bar |
-| literals.rb:92:1:92:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
-| literals.rb:93:1:93:18 | :"foo_#{ 3 - 2 }" | :foo_#{ 3 - 2 } |
-| literals.rb:110:4:110:6 | :"foo" | :foo |
-| literals.rb:110:8:110:10 | :"bar" | :bar |
-| literals.rb:110:12:110:14 | :"baz" | :baz |
-| literals.rb:111:4:111:6 | :"foo" | :foo |
-| literals.rb:111:8:111:10 | :"bar" | :bar |
-| literals.rb:111:12:111:14 | :"baz" | :baz |
-| literals.rb:112:4:112:6 | :"foo" | :foo |
-| literals.rb:112:8:112:20 | :"bar#{...}" | :bar6 |
-| literals.rb:112:22:112:27 | :"#{...}" | :bar |
-| literals.rb:112:29:112:34 | :"#{...}" | :bar |
-| literals.rb:112:36:112:38 | :"baz" | :baz |
-| literals.rb:113:4:113:6 | :"foo" | :foo |
-| literals.rb:113:8:113:12 | :"bar#{" | :bar#{ |
-| literals.rb:113:14:113:14 | :"2" | :2 |
-| literals.rb:113:16:113:16 | :"+" | :+ |
-| literals.rb:113:18:113:18 | :"4" | :4 |
-| literals.rb:113:20:113:20 | :"}" | :} |
-| literals.rb:113:22:113:27 | :"#{bar}" | :#{bar} |
-| literals.rb:113:29:113:34 | :"#{BAR}" | :#{BAR} |
-| literals.rb:113:36:113:38 | :"baz" | :baz |
-| literals.rb:117:3:117:5 | :foo | :foo |
-| literals.rb:117:11:117:14 | :bar | :bar |
-| literals.rb:118:3:118:5 | :foo | :foo |
-| literals.rb:185:2:185:2 | :x | :x |
-| literals.rb:185:6:185:6 | :y | :y |
-| literals.rb:186:2:186:2 | :y | :y |
-| literals.rb:186:7:186:7 | :Z | :Z |
+| literals.rb:97:1:97:3 | :"" | : |
+| literals.rb:98:1:98:6 | :hello | :hello |
+| literals.rb:99:1:99:10 | :"foo bar" | :foo bar |
+| literals.rb:100:1:100:10 | :"bar baz" | :bar baz |
+| literals.rb:101:3:101:5 | :foo | :foo |
+| literals.rb:102:1:102:10 | :"wibble" | :wibble |
+| literals.rb:103:1:103:17 | :"wibble wobble" | :wibble wobble |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | :foo_4_bar_bar |
+| literals.rb:105:1:105:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | :foo_#{ 2 + 2}_#{bar}_#{BAR} |
+| literals.rb:106:1:106:18 | :"foo_#{ 3 - 2 }" | :foo_#{ 3 - 2 } |
+| literals.rb:123:4:123:6 | :"foo" | :foo |
+| literals.rb:123:8:123:10 | :"bar" | :bar |
+| literals.rb:123:12:123:14 | :"baz" | :baz |
+| literals.rb:124:4:124:6 | :"foo" | :foo |
+| literals.rb:124:8:124:10 | :"bar" | :bar |
+| literals.rb:124:12:124:14 | :"baz" | :baz |
+| literals.rb:125:4:125:6 | :"foo" | :foo |
+| literals.rb:125:8:125:20 | :"bar#{...}" | :bar6 |
+| literals.rb:125:22:125:27 | :"#{...}" | :bar |
+| literals.rb:125:29:125:34 | :"#{...}" | :bar |
+| literals.rb:125:36:125:38 | :"baz" | :baz |
+| literals.rb:126:4:126:6 | :"foo" | :foo |
+| literals.rb:126:8:126:12 | :"bar#{" | :bar#{ |
+| literals.rb:126:14:126:14 | :"2" | :2 |
+| literals.rb:126:16:126:16 | :"+" | :+ |
+| literals.rb:126:18:126:18 | :"4" | :4 |
+| literals.rb:126:20:126:20 | :"}" | :} |
+| literals.rb:126:22:126:27 | :"#{bar}" | :#{bar} |
+| literals.rb:126:29:126:34 | :"#{BAR}" | :#{BAR} |
+| literals.rb:126:36:126:38 | :"baz" | :baz |
+| literals.rb:130:3:130:5 | :foo | :foo |
+| literals.rb:130:11:130:14 | :bar | :bar |
+| literals.rb:131:3:131:5 | :foo | :foo |
+| literals.rb:198:2:198:2 | :x | :x |
+| literals.rb:198:6:198:6 | :y | :y |
+| literals.rb:199:2:199:2 | :y | :y |
+| literals.rb:199:7:199:7 | :Z | :Z |
 subshellLiterals
-| literals.rb:130:1:130:7 | `ls -l` | ls -l |
-| literals.rb:131:1:131:9 | `ls -l` | ls -l |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | du -d 2 bar bar |
-| literals.rb:133:1:133:20 | `du -d #{...}` | du -d 1 |
+| literals.rb:143:1:143:7 | `ls -l` | ls -l |
+| literals.rb:144:1:144:9 | `ls -l` | ls -l |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | du -d 2 bar bar |
+| literals.rb:146:1:146:20 | `du -d #{...}` | du -d 1 |
 stringComponents
-| literals.rb:48:1:48:7 | "hello" | StringLiteral | 0 | literals.rb:48:2:48:6 | hello | StringTextComponent |
-| literals.rb:49:1:49:9 | "goodbye" | StringLiteral | 0 | literals.rb:49:2:49:8 | goodbye | StringTextComponent |
-| literals.rb:50:1:50:30 | "string with escaped \\" quote" | StringLiteral | 0 | literals.rb:50:2:50:21 | string with escaped  | StringTextComponent |
-| literals.rb:50:1:50:30 | "string with escaped \\" quote" | StringLiteral | 1 | literals.rb:50:22:50:23 | \\" | StringEscapeSequenceComponent |
-| literals.rb:50:1:50:30 | "string with escaped \\" quote" | StringLiteral | 2 | literals.rb:50:24:50:29 |  quote | StringTextComponent |
-| literals.rb:51:1:51:21 | "string with " quote" | StringLiteral | 0 | literals.rb:51:2:51:20 | string with " quote | StringTextComponent |
-| literals.rb:52:1:52:14 | "foo bar baz" | StringLiteral | 0 | literals.rb:52:3:52:13 | foo bar baz | StringTextComponent |
-| literals.rb:53:1:53:15 | "foo bar baz" | StringLiteral | 0 | literals.rb:53:4:53:14 | foo bar baz | StringTextComponent |
-| literals.rb:54:1:54:20 | "foo ' bar " baz'" | StringLiteral | 0 | literals.rb:54:4:54:19 | foo ' bar " baz' | StringTextComponent |
-| literals.rb:55:1:55:20 | "FOO ' BAR " BAZ'" | StringLiteral | 0 | literals.rb:55:4:55:19 | FOO ' BAR " BAZ' | StringTextComponent |
-| literals.rb:56:1:56:12 | "foo\\ bar" | StringLiteral | 0 | literals.rb:56:4:56:11 | foo\\ bar | StringTextComponent |
-| literals.rb:57:1:57:12 | "foo\\ bar" | StringLiteral | 0 | literals.rb:57:4:57:6 | foo | StringTextComponent |
-| literals.rb:57:1:57:12 | "foo\\ bar" | StringLiteral | 1 | literals.rb:57:7:57:8 | \\  | StringEscapeSequenceComponent |
-| literals.rb:57:1:57:12 | "foo\\ bar" | StringLiteral | 2 | literals.rb:57:9:57:11 | bar | StringTextComponent |
-| literals.rb:58:1:58:20 | "2 + 2 = #{...}" | StringLiteral | 0 | literals.rb:58:2:58:9 | 2 + 2 =  | StringTextComponent |
-| literals.rb:58:1:58:20 | "2 + 2 = #{...}" | StringLiteral | 1 | literals.rb:58:10:58:19 | #{...} | StringInterpolationComponent |
-| literals.rb:59:1:59:22 | "3 + 4 = #{...}" | StringLiteral | 0 | literals.rb:59:4:59:11 | 3 + 4 =  | StringTextComponent |
-| literals.rb:59:1:59:22 | "3 + 4 = #{...}" | StringLiteral | 1 | literals.rb:59:12:59:21 | #{...} | StringInterpolationComponent |
-| literals.rb:60:1:60:20 | "2 + 2 = #{ 2 + 2 }" | StringLiteral | 0 | literals.rb:60:2:60:19 | 2 + 2 = #{ 2 + 2 } | StringTextComponent |
-| literals.rb:61:1:61:22 | "3 + 4 = #{ 3 + 4 }" | StringLiteral | 0 | literals.rb:61:4:61:21 | 3 + 4 = #{ 3 + 4 } | StringTextComponent |
-| literals.rb:62:1:62:5 | "foo" | StringLiteral | 0 | literals.rb:62:2:62:4 | foo | StringTextComponent |
-| literals.rb:62:7:62:11 | "bar" | StringLiteral | 0 | literals.rb:62:8:62:10 | bar | StringTextComponent |
-| literals.rb:62:13:62:17 | "baz" | StringLiteral | 0 | literals.rb:62:14:62:16 | baz | StringTextComponent |
-| literals.rb:63:1:63:7 | "foo" | StringLiteral | 0 | literals.rb:63:4:63:6 | foo | StringTextComponent |
-| literals.rb:63:9:63:13 | "bar" | StringLiteral | 0 | literals.rb:63:10:63:12 | bar | StringTextComponent |
-| literals.rb:63:15:63:19 | "baz" | StringLiteral | 0 | literals.rb:63:16:63:18 | baz | StringTextComponent |
-| literals.rb:64:1:64:5 | "foo" | StringLiteral | 0 | literals.rb:64:2:64:4 | foo | StringTextComponent |
-| literals.rb:64:7:64:21 | "bar#{...}" | StringLiteral | 0 | literals.rb:64:8:64:10 | bar | StringTextComponent |
-| literals.rb:64:7:64:21 | "bar#{...}" | StringLiteral | 1 | literals.rb:64:11:64:20 | #{...} | StringInterpolationComponent |
-| literals.rb:64:23:64:27 | "baz" | StringLiteral | 0 | literals.rb:64:24:64:26 | baz | StringTextComponent |
-| literals.rb:65:1:65:35 | "foo #{...} qux" | StringLiteral | 0 | literals.rb:65:2:65:5 | foo  | StringTextComponent |
-| literals.rb:65:1:65:35 | "foo #{...} qux" | StringLiteral | 1 | literals.rb:65:6:65:30 | #{...} | StringInterpolationComponent |
-| literals.rb:65:1:65:35 | "foo #{...} qux" | StringLiteral | 2 | literals.rb:65:31:65:34 |  qux | StringTextComponent |
-| literals.rb:65:9:65:28 | "bar #{...} baz" | StringLiteral | 0 | literals.rb:65:10:65:13 | bar  | StringTextComponent |
-| literals.rb:65:9:65:28 | "bar #{...} baz" | StringLiteral | 1 | literals.rb:65:14:65:23 | #{...} | StringInterpolationComponent |
-| literals.rb:65:9:65:28 | "bar #{...} baz" | StringLiteral | 2 | literals.rb:65:24:65:27 |  baz | StringTextComponent |
-| literals.rb:66:1:66:22 | "foo #{...}" | StringLiteral | 0 | literals.rb:66:2:66:5 | foo  | StringTextComponent |
-| literals.rb:66:1:66:22 | "foo #{...}" | StringLiteral | 1 | literals.rb:66:6:66:21 | #{...} | StringInterpolationComponent |
-| literals.rb:67:7:67:11 | "bar" | StringLiteral | 0 | literals.rb:67:8:67:10 | bar | StringTextComponent |
-| literals.rb:68:7:68:11 | "bar" | StringLiteral | 0 | literals.rb:68:8:68:10 | bar | StringTextComponent |
-| literals.rb:69:1:69:14 | "foo #{...}" | StringLiteral | 0 | literals.rb:69:2:69:5 | foo  | StringTextComponent |
-| literals.rb:69:1:69:14 | "foo #{...}" | StringLiteral | 1 | literals.rb:69:6:69:13 | #{...} | StringInterpolationComponent |
-| literals.rb:70:1:70:14 | "foo #{...}" | StringLiteral | 0 | literals.rb:70:2:70:5 | foo  | StringTextComponent |
-| literals.rb:70:1:70:14 | "foo #{...}" | StringLiteral | 1 | literals.rb:70:6:70:13 | #{...} | StringInterpolationComponent |
-| literals.rb:86:1:86:10 | :"foo bar" | SymbolLiteral | 0 | literals.rb:86:3:86:9 | foo bar | StringTextComponent |
-| literals.rb:87:1:87:10 | :"bar baz" | SymbolLiteral | 0 | literals.rb:87:3:87:9 | bar baz | StringTextComponent |
-| literals.rb:88:8:88:12 | "bar" | StringLiteral | 0 | literals.rb:88:9:88:11 | bar | StringTextComponent |
-| literals.rb:89:1:89:10 | :"wibble" | SymbolLiteral | 0 | literals.rb:89:4:89:9 | wibble | StringTextComponent |
-| literals.rb:90:1:90:17 | :"wibble wobble" | SymbolLiteral | 0 | literals.rb:90:4:90:16 | wibble wobble | StringTextComponent |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 0 | literals.rb:91:3:91:6 | foo_ | StringTextComponent |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 1 | literals.rb:91:7:91:15 | #{...} | StringInterpolationComponent |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 2 | literals.rb:91:16:91:16 | _ | StringTextComponent |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 3 | literals.rb:91:17:91:22 | #{...} | StringInterpolationComponent |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 4 | literals.rb:91:23:91:23 | _ | StringTextComponent |
-| literals.rb:91:1:91:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 5 | literals.rb:91:24:91:29 | #{...} | StringInterpolationComponent |
-| literals.rb:92:1:92:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | SymbolLiteral | 0 | literals.rb:92:3:92:29 | foo_#{ 2 + 2}_#{bar}_#{BAR} | StringTextComponent |
-| literals.rb:93:1:93:18 | :"foo_#{ 3 - 2 }" | SymbolLiteral | 0 | literals.rb:93:4:93:17 | foo_#{ 3 - 2 } | StringTextComponent |
-| literals.rb:103:4:103:6 | "foo" | StringLiteral | 0 | literals.rb:103:4:103:6 | foo | StringTextComponent |
-| literals.rb:103:8:103:10 | "bar" | StringLiteral | 0 | literals.rb:103:8:103:10 | bar | StringTextComponent |
-| literals.rb:103:12:103:14 | "baz" | StringLiteral | 0 | literals.rb:103:12:103:14 | baz | StringTextComponent |
-| literals.rb:104:4:104:6 | "foo" | StringLiteral | 0 | literals.rb:104:4:104:6 | foo | StringTextComponent |
-| literals.rb:104:8:104:10 | "bar" | StringLiteral | 0 | literals.rb:104:8:104:10 | bar | StringTextComponent |
-| literals.rb:104:12:104:14 | "baz" | StringLiteral | 0 | literals.rb:104:12:104:14 | baz | StringTextComponent |
-| literals.rb:105:4:105:6 | "foo" | StringLiteral | 0 | literals.rb:105:4:105:6 | foo | StringTextComponent |
-| literals.rb:105:8:105:16 | "bar#{...}" | StringLiteral | 0 | literals.rb:105:8:105:10 | bar | StringTextComponent |
-| literals.rb:105:8:105:16 | "bar#{...}" | StringLiteral | 1 | literals.rb:105:11:105:16 | #{...} | StringInterpolationComponent |
-| literals.rb:105:18:105:23 | "#{...}" | StringLiteral | 0 | literals.rb:105:18:105:23 | #{...} | StringInterpolationComponent |
-| literals.rb:105:25:105:30 | "#{...}" | StringLiteral | 0 | literals.rb:105:25:105:30 | #{...} | StringInterpolationComponent |
-| literals.rb:105:32:105:34 | "baz" | StringLiteral | 0 | literals.rb:105:32:105:34 | baz | StringTextComponent |
-| literals.rb:106:4:106:6 | "foo" | StringLiteral | 0 | literals.rb:106:4:106:6 | foo | StringTextComponent |
-| literals.rb:106:8:106:16 | "bar#{1+1}" | StringLiteral | 0 | literals.rb:106:8:106:16 | bar#{1+1} | StringTextComponent |
-| literals.rb:106:18:106:23 | "#{bar}" | StringLiteral | 0 | literals.rb:106:18:106:23 | #{bar} | StringTextComponent |
-| literals.rb:106:25:106:30 | "#{BAR}" | StringLiteral | 0 | literals.rb:106:25:106:30 | #{BAR} | StringTextComponent |
-| literals.rb:106:32:106:34 | "baz" | StringLiteral | 0 | literals.rb:106:32:106:34 | baz | StringTextComponent |
-| literals.rb:110:4:110:6 | :"foo" | SymbolLiteral | 0 | literals.rb:110:4:110:6 | foo | StringTextComponent |
-| literals.rb:110:8:110:10 | :"bar" | SymbolLiteral | 0 | literals.rb:110:8:110:10 | bar | StringTextComponent |
-| literals.rb:110:12:110:14 | :"baz" | SymbolLiteral | 0 | literals.rb:110:12:110:14 | baz | StringTextComponent |
-| literals.rb:111:4:111:6 | :"foo" | SymbolLiteral | 0 | literals.rb:111:4:111:6 | foo | StringTextComponent |
-| literals.rb:111:8:111:10 | :"bar" | SymbolLiteral | 0 | literals.rb:111:8:111:10 | bar | StringTextComponent |
-| literals.rb:111:12:111:14 | :"baz" | SymbolLiteral | 0 | literals.rb:111:12:111:14 | baz | StringTextComponent |
-| literals.rb:112:4:112:6 | :"foo" | SymbolLiteral | 0 | literals.rb:112:4:112:6 | foo | StringTextComponent |
-| literals.rb:112:8:112:20 | :"bar#{...}" | SymbolLiteral | 0 | literals.rb:112:8:112:10 | bar | StringTextComponent |
-| literals.rb:112:8:112:20 | :"bar#{...}" | SymbolLiteral | 1 | literals.rb:112:11:112:20 | #{...} | StringInterpolationComponent |
-| literals.rb:112:22:112:27 | :"#{...}" | SymbolLiteral | 0 | literals.rb:112:22:112:27 | #{...} | StringInterpolationComponent |
-| literals.rb:112:29:112:34 | :"#{...}" | SymbolLiteral | 0 | literals.rb:112:29:112:34 | #{...} | StringInterpolationComponent |
-| literals.rb:112:36:112:38 | :"baz" | SymbolLiteral | 0 | literals.rb:112:36:112:38 | baz | StringTextComponent |
-| literals.rb:113:4:113:6 | :"foo" | SymbolLiteral | 0 | literals.rb:113:4:113:6 | foo | StringTextComponent |
-| literals.rb:113:8:113:12 | :"bar#{" | SymbolLiteral | 0 | literals.rb:113:8:113:12 | bar#{ | StringTextComponent |
-| literals.rb:113:14:113:14 | :"2" | SymbolLiteral | 0 | literals.rb:113:14:113:14 | 2 | StringTextComponent |
-| literals.rb:113:16:113:16 | :"+" | SymbolLiteral | 0 | literals.rb:113:16:113:16 | + | StringTextComponent |
-| literals.rb:113:18:113:18 | :"4" | SymbolLiteral | 0 | literals.rb:113:18:113:18 | 4 | StringTextComponent |
-| literals.rb:113:20:113:20 | :"}" | SymbolLiteral | 0 | literals.rb:113:20:113:20 | } | StringTextComponent |
-| literals.rb:113:22:113:27 | :"#{bar}" | SymbolLiteral | 0 | literals.rb:113:22:113:27 | #{bar} | StringTextComponent |
-| literals.rb:113:29:113:34 | :"#{BAR}" | SymbolLiteral | 0 | literals.rb:113:29:113:34 | #{BAR} | StringTextComponent |
-| literals.rb:113:36:113:38 | :"baz" | SymbolLiteral | 0 | literals.rb:113:36:113:38 | baz | StringTextComponent |
-| literals.rb:117:22:117:26 | "baz" | StringLiteral | 0 | literals.rb:117:23:117:25 | baz | StringTextComponent |
-| literals.rb:130:1:130:7 | `ls -l` | SubshellLiteral | 0 | literals.rb:130:2:130:6 | ls -l | StringTextComponent |
-| literals.rb:131:1:131:9 | `ls -l` | SubshellLiteral | 0 | literals.rb:131:4:131:8 | ls -l | StringTextComponent |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 0 | literals.rb:132:2:132:7 | du -d  | StringTextComponent |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 1 | literals.rb:132:8:132:17 | #{...} | StringInterpolationComponent |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 2 | literals.rb:132:18:132:18 |   | StringTextComponent |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 3 | literals.rb:132:19:132:24 | #{...} | StringInterpolationComponent |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 4 | literals.rb:132:25:132:25 |   | StringTextComponent |
-| literals.rb:132:1:132:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 5 | literals.rb:132:26:132:31 | #{...} | StringInterpolationComponent |
-| literals.rb:133:1:133:20 | `du -d #{...}` | SubshellLiteral | 0 | literals.rb:133:4:133:9 | du -d  | StringTextComponent |
-| literals.rb:133:1:133:20 | `du -d #{...}` | SubshellLiteral | 1 | literals.rb:133:10:133:19 | #{...} | StringInterpolationComponent |
-| literals.rb:137:1:137:5 | /foo/ | RegExpLiteral | 0 | literals.rb:137:2:137:4 | foo | RegExpTextComponent |
-| literals.rb:138:1:138:6 | /foo/ | RegExpLiteral | 0 | literals.rb:138:2:138:4 | foo | RegExpTextComponent |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | RegExpLiteral | 0 | literals.rb:139:2:139:5 | foo+ | RegExpTextComponent |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | RegExpLiteral | 1 | literals.rb:139:6:139:7 | \\s | RegExpEscapeSequenceComponent |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | RegExpLiteral | 2 | literals.rb:139:8:139:10 | bar | RegExpTextComponent |
-| literals.rb:139:1:139:13 | /foo+\\sbar\\S/ | RegExpLiteral | 3 | literals.rb:139:11:139:12 | \\S | RegExpEscapeSequenceComponent |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 0 | literals.rb:140:2:140:4 | foo | RegExpTextComponent |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 1 | literals.rb:140:5:140:14 | #{...} | RegExpInterpolationComponent |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 2 | literals.rb:140:15:140:17 | bar | RegExpTextComponent |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 3 | literals.rb:140:18:140:23 | #{...} | RegExpInterpolationComponent |
-| literals.rb:140:1:140:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 4 | literals.rb:140:24:140:29 | #{...} | RegExpInterpolationComponent |
-| literals.rb:141:1:141:8 | /foo/ | RegExpLiteral | 0 | literals.rb:141:2:141:4 | foo | RegExpTextComponent |
-| literals.rb:143:1:143:7 | /foo/ | RegExpLiteral | 0 | literals.rb:143:4:143:6 | foo | RegExpTextComponent |
-| literals.rb:144:1:144:8 | /foo/ | RegExpLiteral | 0 | literals.rb:144:4:144:6 | foo | RegExpTextComponent |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | RegExpLiteral | 0 | literals.rb:145:4:145:7 | foo+ | RegExpTextComponent |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | RegExpLiteral | 1 | literals.rb:145:8:145:9 | \\s | RegExpEscapeSequenceComponent |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | RegExpLiteral | 2 | literals.rb:145:10:145:12 | bar | RegExpTextComponent |
-| literals.rb:145:1:145:15 | /foo+\\sbar\\S/ | RegExpLiteral | 3 | literals.rb:145:13:145:14 | \\S | RegExpEscapeSequenceComponent |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 0 | literals.rb:146:4:146:6 | foo | RegExpTextComponent |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 1 | literals.rb:146:7:146:16 | #{...} | RegExpInterpolationComponent |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 2 | literals.rb:146:17:146:19 | bar | RegExpTextComponent |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 3 | literals.rb:146:20:146:25 | #{...} | RegExpInterpolationComponent |
-| literals.rb:146:1:146:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 4 | literals.rb:146:26:146:31 | #{...} | RegExpInterpolationComponent |
-| literals.rb:147:1:147:10 | /foo/ | RegExpLiteral | 0 | literals.rb:147:4:147:6 | foo | RegExpTextComponent |
-| literals.rb:150:1:150:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | StringLiteral | 0 | literals.rb:150:2:150:33 | abcdefghijklmnopqrstuvwxyzabcdef | StringTextComponent |
-| literals.rb:151:1:151:35 | "foobarfoobarfoobarfoobarfooba..." | StringLiteral | 0 | literals.rb:151:2:151:34 | foobarfoobarfoobarfoobarfoobarfoo | StringTextComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 0 | literals.rb:152:2:152:7 | foobar | StringTextComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 1 | literals.rb:152:8:152:9 | \\\\ | StringEscapeSequenceComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 2 | literals.rb:152:10:152:15 | foobar | StringTextComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 3 | literals.rb:152:16:152:17 | \\\\ | StringEscapeSequenceComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 4 | literals.rb:152:18:152:23 | foobar | StringTextComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 5 | literals.rb:152:24:152:25 | \\\\ | StringEscapeSequenceComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 6 | literals.rb:152:26:152:31 | foobar | StringTextComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 7 | literals.rb:152:32:152:33 | \\\\ | StringEscapeSequenceComponent |
-| literals.rb:152:1:152:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 8 | literals.rb:152:34:152:39 | foobar | StringTextComponent |
-| literals.rb:155:9:155:13 | <<SQL | HereDoc | 0 | literals.rb:155:22:156:20 | \nselect * from table\n | StringTextComponent |
-| literals.rb:155:16:155:20 | <<SQL | HereDoc | 0 | literals.rb:157:4:158:13 | \nwhere name =  | StringTextComponent |
-| literals.rb:155:16:155:20 | <<SQL | HereDoc | 1 | literals.rb:158:14:158:22 | #{...} | StringInterpolationComponent |
-| literals.rb:155:16:155:20 | <<SQL | HereDoc | 2 | literals.rb:158:23:158:23 | \n | StringTextComponent |
-| literals.rb:162:11:162:16 | <<-BLA | HereDoc | 0 | literals.rb:162:17:163:9 | \nsome text | StringTextComponent |
-| literals.rb:162:11:162:16 | <<-BLA | HereDoc | 1 | literals.rb:163:10:163:11 | \\n | StringEscapeSequenceComponent |
-| literals.rb:162:11:162:16 | <<-BLA | HereDoc | 2 | literals.rb:163:12:164:2 | and some more\n   | StringTextComponent |
-| literals.rb:167:9:167:19 | <<~SQUIGGLY | HereDoc | 0 | literals.rb:167:20:168:18 | \n   indented stuff\n | StringTextComponent |
-| literals.rb:171:9:171:15 | <<"DOC" | HereDoc | 0 | literals.rb:171:16:172:11 | \n text with  | StringTextComponent |
-| literals.rb:171:9:171:15 | <<"DOC" | HereDoc | 1 | literals.rb:172:12:172:29 | #{...} | StringInterpolationComponent |
-| literals.rb:171:9:171:15 | <<"DOC" | HereDoc | 2 | literals.rb:172:30:172:32 |  !\n | StringTextComponent |
-| literals.rb:176:9:176:15 | <<'DOC' | HereDoc | 0 | literals.rb:176:16:177:14 | \n text without  | StringTextComponent |
-| literals.rb:176:9:176:15 | <<'DOC' | HereDoc | 1 | literals.rb:177:15:177:32 | #{...} | StringInterpolationComponent |
-| literals.rb:176:9:176:15 | <<'DOC' | HereDoc | 2 | literals.rb:177:33:177:35 |  !\n | StringTextComponent |
-| literals.rb:180:10:180:19 | <<`SCRIPT` | HereDoc | 0 | literals.rb:180:20:181:14 | \n cat file.txt\n | StringTextComponent |
+| literals.rb:61:1:61:7 | "hello" | StringLiteral | 0 | literals.rb:61:2:61:6 | hello | StringTextComponent |
+| literals.rb:62:1:62:9 | "goodbye" | StringLiteral | 0 | literals.rb:62:2:62:8 | goodbye | StringTextComponent |
+| literals.rb:63:1:63:30 | "string with escaped \\" quote" | StringLiteral | 0 | literals.rb:63:2:63:21 | string with escaped  | StringTextComponent |
+| literals.rb:63:1:63:30 | "string with escaped \\" quote" | StringLiteral | 1 | literals.rb:63:22:63:23 | \\" | StringEscapeSequenceComponent |
+| literals.rb:63:1:63:30 | "string with escaped \\" quote" | StringLiteral | 2 | literals.rb:63:24:63:29 |  quote | StringTextComponent |
+| literals.rb:64:1:64:21 | "string with " quote" | StringLiteral | 0 | literals.rb:64:2:64:20 | string with " quote | StringTextComponent |
+| literals.rb:65:1:65:14 | "foo bar baz" | StringLiteral | 0 | literals.rb:65:3:65:13 | foo bar baz | StringTextComponent |
+| literals.rb:66:1:66:15 | "foo bar baz" | StringLiteral | 0 | literals.rb:66:4:66:14 | foo bar baz | StringTextComponent |
+| literals.rb:67:1:67:20 | "foo ' bar " baz'" | StringLiteral | 0 | literals.rb:67:4:67:19 | foo ' bar " baz' | StringTextComponent |
+| literals.rb:68:1:68:20 | "FOO ' BAR " BAZ'" | StringLiteral | 0 | literals.rb:68:4:68:19 | FOO ' BAR " BAZ' | StringTextComponent |
+| literals.rb:69:1:69:12 | "foo\\ bar" | StringLiteral | 0 | literals.rb:69:4:69:11 | foo\\ bar | StringTextComponent |
+| literals.rb:70:1:70:12 | "foo\\ bar" | StringLiteral | 0 | literals.rb:70:4:70:6 | foo | StringTextComponent |
+| literals.rb:70:1:70:12 | "foo\\ bar" | StringLiteral | 1 | literals.rb:70:7:70:8 | \\  | StringEscapeSequenceComponent |
+| literals.rb:70:1:70:12 | "foo\\ bar" | StringLiteral | 2 | literals.rb:70:9:70:11 | bar | StringTextComponent |
+| literals.rb:71:1:71:20 | "2 + 2 = #{...}" | StringLiteral | 0 | literals.rb:71:2:71:9 | 2 + 2 =  | StringTextComponent |
+| literals.rb:71:1:71:20 | "2 + 2 = #{...}" | StringLiteral | 1 | literals.rb:71:10:71:19 | #{...} | StringInterpolationComponent |
+| literals.rb:72:1:72:22 | "3 + 4 = #{...}" | StringLiteral | 0 | literals.rb:72:4:72:11 | 3 + 4 =  | StringTextComponent |
+| literals.rb:72:1:72:22 | "3 + 4 = #{...}" | StringLiteral | 1 | literals.rb:72:12:72:21 | #{...} | StringInterpolationComponent |
+| literals.rb:73:1:73:20 | "2 + 2 = #{ 2 + 2 }" | StringLiteral | 0 | literals.rb:73:2:73:19 | 2 + 2 = #{ 2 + 2 } | StringTextComponent |
+| literals.rb:74:1:74:22 | "3 + 4 = #{ 3 + 4 }" | StringLiteral | 0 | literals.rb:74:4:74:21 | 3 + 4 = #{ 3 + 4 } | StringTextComponent |
+| literals.rb:75:1:75:5 | "foo" | StringLiteral | 0 | literals.rb:75:2:75:4 | foo | StringTextComponent |
+| literals.rb:75:7:75:11 | "bar" | StringLiteral | 0 | literals.rb:75:8:75:10 | bar | StringTextComponent |
+| literals.rb:75:13:75:17 | "baz" | StringLiteral | 0 | literals.rb:75:14:75:16 | baz | StringTextComponent |
+| literals.rb:76:1:76:7 | "foo" | StringLiteral | 0 | literals.rb:76:4:76:6 | foo | StringTextComponent |
+| literals.rb:76:9:76:13 | "bar" | StringLiteral | 0 | literals.rb:76:10:76:12 | bar | StringTextComponent |
+| literals.rb:76:15:76:19 | "baz" | StringLiteral | 0 | literals.rb:76:16:76:18 | baz | StringTextComponent |
+| literals.rb:77:1:77:5 | "foo" | StringLiteral | 0 | literals.rb:77:2:77:4 | foo | StringTextComponent |
+| literals.rb:77:7:77:21 | "bar#{...}" | StringLiteral | 0 | literals.rb:77:8:77:10 | bar | StringTextComponent |
+| literals.rb:77:7:77:21 | "bar#{...}" | StringLiteral | 1 | literals.rb:77:11:77:20 | #{...} | StringInterpolationComponent |
+| literals.rb:77:23:77:27 | "baz" | StringLiteral | 0 | literals.rb:77:24:77:26 | baz | StringTextComponent |
+| literals.rb:78:1:78:35 | "foo #{...} qux" | StringLiteral | 0 | literals.rb:78:2:78:5 | foo  | StringTextComponent |
+| literals.rb:78:1:78:35 | "foo #{...} qux" | StringLiteral | 1 | literals.rb:78:6:78:30 | #{...} | StringInterpolationComponent |
+| literals.rb:78:1:78:35 | "foo #{...} qux" | StringLiteral | 2 | literals.rb:78:31:78:34 |  qux | StringTextComponent |
+| literals.rb:78:9:78:28 | "bar #{...} baz" | StringLiteral | 0 | literals.rb:78:10:78:13 | bar  | StringTextComponent |
+| literals.rb:78:9:78:28 | "bar #{...} baz" | StringLiteral | 1 | literals.rb:78:14:78:23 | #{...} | StringInterpolationComponent |
+| literals.rb:78:9:78:28 | "bar #{...} baz" | StringLiteral | 2 | literals.rb:78:24:78:27 |  baz | StringTextComponent |
+| literals.rb:79:1:79:22 | "foo #{...}" | StringLiteral | 0 | literals.rb:79:2:79:5 | foo  | StringTextComponent |
+| literals.rb:79:1:79:22 | "foo #{...}" | StringLiteral | 1 | literals.rb:79:6:79:21 | #{...} | StringInterpolationComponent |
+| literals.rb:80:7:80:11 | "bar" | StringLiteral | 0 | literals.rb:80:8:80:10 | bar | StringTextComponent |
+| literals.rb:81:7:81:11 | "bar" | StringLiteral | 0 | literals.rb:81:8:81:10 | bar | StringTextComponent |
+| literals.rb:82:1:82:14 | "foo #{...}" | StringLiteral | 0 | literals.rb:82:2:82:5 | foo  | StringTextComponent |
+| literals.rb:82:1:82:14 | "foo #{...}" | StringLiteral | 1 | literals.rb:82:6:82:13 | #{...} | StringInterpolationComponent |
+| literals.rb:83:1:83:14 | "foo #{...}" | StringLiteral | 0 | literals.rb:83:2:83:5 | foo  | StringTextComponent |
+| literals.rb:83:1:83:14 | "foo #{...}" | StringLiteral | 1 | literals.rb:83:6:83:13 | #{...} | StringInterpolationComponent |
+| literals.rb:99:1:99:10 | :"foo bar" | SymbolLiteral | 0 | literals.rb:99:3:99:9 | foo bar | StringTextComponent |
+| literals.rb:100:1:100:10 | :"bar baz" | SymbolLiteral | 0 | literals.rb:100:3:100:9 | bar baz | StringTextComponent |
+| literals.rb:101:8:101:12 | "bar" | StringLiteral | 0 | literals.rb:101:9:101:11 | bar | StringTextComponent |
+| literals.rb:102:1:102:10 | :"wibble" | SymbolLiteral | 0 | literals.rb:102:4:102:9 | wibble | StringTextComponent |
+| literals.rb:103:1:103:17 | :"wibble wobble" | SymbolLiteral | 0 | literals.rb:103:4:103:16 | wibble wobble | StringTextComponent |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 0 | literals.rb:104:3:104:6 | foo_ | StringTextComponent |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 1 | literals.rb:104:7:104:15 | #{...} | StringInterpolationComponent |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 2 | literals.rb:104:16:104:16 | _ | StringTextComponent |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 3 | literals.rb:104:17:104:22 | #{...} | StringInterpolationComponent |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 4 | literals.rb:104:23:104:23 | _ | StringTextComponent |
+| literals.rb:104:1:104:30 | :"foo_#{...}_#{...}_#{...}" | SymbolLiteral | 5 | literals.rb:104:24:104:29 | #{...} | StringInterpolationComponent |
+| literals.rb:105:1:105:30 | :"foo_#{ 2 + 2}_#{bar}_#{BAR}" | SymbolLiteral | 0 | literals.rb:105:3:105:29 | foo_#{ 2 + 2}_#{bar}_#{BAR} | StringTextComponent |
+| literals.rb:106:1:106:18 | :"foo_#{ 3 - 2 }" | SymbolLiteral | 0 | literals.rb:106:4:106:17 | foo_#{ 3 - 2 } | StringTextComponent |
+| literals.rb:116:4:116:6 | "foo" | StringLiteral | 0 | literals.rb:116:4:116:6 | foo | StringTextComponent |
+| literals.rb:116:8:116:10 | "bar" | StringLiteral | 0 | literals.rb:116:8:116:10 | bar | StringTextComponent |
+| literals.rb:116:12:116:14 | "baz" | StringLiteral | 0 | literals.rb:116:12:116:14 | baz | StringTextComponent |
+| literals.rb:117:4:117:6 | "foo" | StringLiteral | 0 | literals.rb:117:4:117:6 | foo | StringTextComponent |
+| literals.rb:117:8:117:10 | "bar" | StringLiteral | 0 | literals.rb:117:8:117:10 | bar | StringTextComponent |
+| literals.rb:117:12:117:14 | "baz" | StringLiteral | 0 | literals.rb:117:12:117:14 | baz | StringTextComponent |
+| literals.rb:118:4:118:6 | "foo" | StringLiteral | 0 | literals.rb:118:4:118:6 | foo | StringTextComponent |
+| literals.rb:118:8:118:16 | "bar#{...}" | StringLiteral | 0 | literals.rb:118:8:118:10 | bar | StringTextComponent |
+| literals.rb:118:8:118:16 | "bar#{...}" | StringLiteral | 1 | literals.rb:118:11:118:16 | #{...} | StringInterpolationComponent |
+| literals.rb:118:18:118:23 | "#{...}" | StringLiteral | 0 | literals.rb:118:18:118:23 | #{...} | StringInterpolationComponent |
+| literals.rb:118:25:118:30 | "#{...}" | StringLiteral | 0 | literals.rb:118:25:118:30 | #{...} | StringInterpolationComponent |
+| literals.rb:118:32:118:34 | "baz" | StringLiteral | 0 | literals.rb:118:32:118:34 | baz | StringTextComponent |
+| literals.rb:119:4:119:6 | "foo" | StringLiteral | 0 | literals.rb:119:4:119:6 | foo | StringTextComponent |
+| literals.rb:119:8:119:16 | "bar#{1+1}" | StringLiteral | 0 | literals.rb:119:8:119:16 | bar#{1+1} | StringTextComponent |
+| literals.rb:119:18:119:23 | "#{bar}" | StringLiteral | 0 | literals.rb:119:18:119:23 | #{bar} | StringTextComponent |
+| literals.rb:119:25:119:30 | "#{BAR}" | StringLiteral | 0 | literals.rb:119:25:119:30 | #{BAR} | StringTextComponent |
+| literals.rb:119:32:119:34 | "baz" | StringLiteral | 0 | literals.rb:119:32:119:34 | baz | StringTextComponent |
+| literals.rb:123:4:123:6 | :"foo" | SymbolLiteral | 0 | literals.rb:123:4:123:6 | foo | StringTextComponent |
+| literals.rb:123:8:123:10 | :"bar" | SymbolLiteral | 0 | literals.rb:123:8:123:10 | bar | StringTextComponent |
+| literals.rb:123:12:123:14 | :"baz" | SymbolLiteral | 0 | literals.rb:123:12:123:14 | baz | StringTextComponent |
+| literals.rb:124:4:124:6 | :"foo" | SymbolLiteral | 0 | literals.rb:124:4:124:6 | foo | StringTextComponent |
+| literals.rb:124:8:124:10 | :"bar" | SymbolLiteral | 0 | literals.rb:124:8:124:10 | bar | StringTextComponent |
+| literals.rb:124:12:124:14 | :"baz" | SymbolLiteral | 0 | literals.rb:124:12:124:14 | baz | StringTextComponent |
+| literals.rb:125:4:125:6 | :"foo" | SymbolLiteral | 0 | literals.rb:125:4:125:6 | foo | StringTextComponent |
+| literals.rb:125:8:125:20 | :"bar#{...}" | SymbolLiteral | 0 | literals.rb:125:8:125:10 | bar | StringTextComponent |
+| literals.rb:125:8:125:20 | :"bar#{...}" | SymbolLiteral | 1 | literals.rb:125:11:125:20 | #{...} | StringInterpolationComponent |
+| literals.rb:125:22:125:27 | :"#{...}" | SymbolLiteral | 0 | literals.rb:125:22:125:27 | #{...} | StringInterpolationComponent |
+| literals.rb:125:29:125:34 | :"#{...}" | SymbolLiteral | 0 | literals.rb:125:29:125:34 | #{...} | StringInterpolationComponent |
+| literals.rb:125:36:125:38 | :"baz" | SymbolLiteral | 0 | literals.rb:125:36:125:38 | baz | StringTextComponent |
+| literals.rb:126:4:126:6 | :"foo" | SymbolLiteral | 0 | literals.rb:126:4:126:6 | foo | StringTextComponent |
+| literals.rb:126:8:126:12 | :"bar#{" | SymbolLiteral | 0 | literals.rb:126:8:126:12 | bar#{ | StringTextComponent |
+| literals.rb:126:14:126:14 | :"2" | SymbolLiteral | 0 | literals.rb:126:14:126:14 | 2 | StringTextComponent |
+| literals.rb:126:16:126:16 | :"+" | SymbolLiteral | 0 | literals.rb:126:16:126:16 | + | StringTextComponent |
+| literals.rb:126:18:126:18 | :"4" | SymbolLiteral | 0 | literals.rb:126:18:126:18 | 4 | StringTextComponent |
+| literals.rb:126:20:126:20 | :"}" | SymbolLiteral | 0 | literals.rb:126:20:126:20 | } | StringTextComponent |
+| literals.rb:126:22:126:27 | :"#{bar}" | SymbolLiteral | 0 | literals.rb:126:22:126:27 | #{bar} | StringTextComponent |
+| literals.rb:126:29:126:34 | :"#{BAR}" | SymbolLiteral | 0 | literals.rb:126:29:126:34 | #{BAR} | StringTextComponent |
+| literals.rb:126:36:126:38 | :"baz" | SymbolLiteral | 0 | literals.rb:126:36:126:38 | baz | StringTextComponent |
+| literals.rb:130:22:130:26 | "baz" | StringLiteral | 0 | literals.rb:130:23:130:25 | baz | StringTextComponent |
+| literals.rb:143:1:143:7 | `ls -l` | SubshellLiteral | 0 | literals.rb:143:2:143:6 | ls -l | StringTextComponent |
+| literals.rb:144:1:144:9 | `ls -l` | SubshellLiteral | 0 | literals.rb:144:4:144:8 | ls -l | StringTextComponent |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 0 | literals.rb:145:2:145:7 | du -d  | StringTextComponent |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 1 | literals.rb:145:8:145:17 | #{...} | StringInterpolationComponent |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 2 | literals.rb:145:18:145:18 |   | StringTextComponent |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 3 | literals.rb:145:19:145:24 | #{...} | StringInterpolationComponent |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 4 | literals.rb:145:25:145:25 |   | StringTextComponent |
+| literals.rb:145:1:145:32 | `du -d #{...} #{...} #{...}` | SubshellLiteral | 5 | literals.rb:145:26:145:31 | #{...} | StringInterpolationComponent |
+| literals.rb:146:1:146:20 | `du -d #{...}` | SubshellLiteral | 0 | literals.rb:146:4:146:9 | du -d  | StringTextComponent |
+| literals.rb:146:1:146:20 | `du -d #{...}` | SubshellLiteral | 1 | literals.rb:146:10:146:19 | #{...} | StringInterpolationComponent |
+| literals.rb:150:1:150:5 | /foo/ | RegExpLiteral | 0 | literals.rb:150:2:150:4 | foo | RegExpTextComponent |
+| literals.rb:151:1:151:6 | /foo/ | RegExpLiteral | 0 | literals.rb:151:2:151:4 | foo | RegExpTextComponent |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | RegExpLiteral | 0 | literals.rb:152:2:152:5 | foo+ | RegExpTextComponent |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | RegExpLiteral | 1 | literals.rb:152:6:152:7 | \\s | RegExpEscapeSequenceComponent |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | RegExpLiteral | 2 | literals.rb:152:8:152:10 | bar | RegExpTextComponent |
+| literals.rb:152:1:152:13 | /foo+\\sbar\\S/ | RegExpLiteral | 3 | literals.rb:152:11:152:12 | \\S | RegExpEscapeSequenceComponent |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 0 | literals.rb:153:2:153:4 | foo | RegExpTextComponent |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 1 | literals.rb:153:5:153:14 | #{...} | RegExpInterpolationComponent |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 2 | literals.rb:153:15:153:17 | bar | RegExpTextComponent |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 3 | literals.rb:153:18:153:23 | #{...} | RegExpInterpolationComponent |
+| literals.rb:153:1:153:30 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 4 | literals.rb:153:24:153:29 | #{...} | RegExpInterpolationComponent |
+| literals.rb:154:1:154:8 | /foo/ | RegExpLiteral | 0 | literals.rb:154:2:154:4 | foo | RegExpTextComponent |
+| literals.rb:156:1:156:7 | /foo/ | RegExpLiteral | 0 | literals.rb:156:4:156:6 | foo | RegExpTextComponent |
+| literals.rb:157:1:157:8 | /foo/ | RegExpLiteral | 0 | literals.rb:157:4:157:6 | foo | RegExpTextComponent |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | RegExpLiteral | 0 | literals.rb:158:4:158:7 | foo+ | RegExpTextComponent |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | RegExpLiteral | 1 | literals.rb:158:8:158:9 | \\s | RegExpEscapeSequenceComponent |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | RegExpLiteral | 2 | literals.rb:158:10:158:12 | bar | RegExpTextComponent |
+| literals.rb:158:1:158:15 | /foo+\\sbar\\S/ | RegExpLiteral | 3 | literals.rb:158:13:158:14 | \\S | RegExpEscapeSequenceComponent |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 0 | literals.rb:159:4:159:6 | foo | RegExpTextComponent |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 1 | literals.rb:159:7:159:16 | #{...} | RegExpInterpolationComponent |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 2 | literals.rb:159:17:159:19 | bar | RegExpTextComponent |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 3 | literals.rb:159:20:159:25 | #{...} | RegExpInterpolationComponent |
+| literals.rb:159:1:159:32 | /foo#{...}bar#{...}#{...}/ | RegExpLiteral | 4 | literals.rb:159:26:159:31 | #{...} | RegExpInterpolationComponent |
+| literals.rb:160:1:160:10 | /foo/ | RegExpLiteral | 0 | literals.rb:160:4:160:6 | foo | RegExpTextComponent |
+| literals.rb:163:1:163:34 | "abcdefghijklmnopqrstuvwxyzabcdef" | StringLiteral | 0 | literals.rb:163:2:163:33 | abcdefghijklmnopqrstuvwxyzabcdef | StringTextComponent |
+| literals.rb:164:1:164:35 | "foobarfoobarfoobarfoobarfooba..." | StringLiteral | 0 | literals.rb:164:2:164:34 | foobarfoobarfoobarfoobarfoobarfoo | StringTextComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 0 | literals.rb:165:2:165:7 | foobar | StringTextComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 1 | literals.rb:165:8:165:9 | \\\\ | StringEscapeSequenceComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 2 | literals.rb:165:10:165:15 | foobar | StringTextComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 3 | literals.rb:165:16:165:17 | \\\\ | StringEscapeSequenceComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 4 | literals.rb:165:18:165:23 | foobar | StringTextComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 5 | literals.rb:165:24:165:25 | \\\\ | StringEscapeSequenceComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 6 | literals.rb:165:26:165:31 | foobar | StringTextComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 7 | literals.rb:165:32:165:33 | \\\\ | StringEscapeSequenceComponent |
+| literals.rb:165:1:165:40 | "foobar\\\\foobar\\\\foobar\\\\fooba..." | StringLiteral | 8 | literals.rb:165:34:165:39 | foobar | StringTextComponent |
+| literals.rb:168:9:168:13 | <<SQL | HereDoc | 0 | literals.rb:168:22:169:20 | \nselect * from table\n | StringTextComponent |
+| literals.rb:168:16:168:20 | <<SQL | HereDoc | 0 | literals.rb:170:4:171:13 | \nwhere name =  | StringTextComponent |
+| literals.rb:168:16:168:20 | <<SQL | HereDoc | 1 | literals.rb:171:14:171:22 | #{...} | StringInterpolationComponent |
+| literals.rb:168:16:168:20 | <<SQL | HereDoc | 2 | literals.rb:171:23:171:23 | \n | StringTextComponent |
+| literals.rb:175:11:175:16 | <<-BLA | HereDoc | 0 | literals.rb:175:17:176:9 | \nsome text | StringTextComponent |
+| literals.rb:175:11:175:16 | <<-BLA | HereDoc | 1 | literals.rb:176:10:176:11 | \\n | StringEscapeSequenceComponent |
+| literals.rb:175:11:175:16 | <<-BLA | HereDoc | 2 | literals.rb:176:12:177:2 | and some more\n   | StringTextComponent |
+| literals.rb:180:9:180:19 | <<~SQUIGGLY | HereDoc | 0 | literals.rb:180:20:181:18 | \n   indented stuff\n | StringTextComponent |
+| literals.rb:184:9:184:15 | <<"DOC" | HereDoc | 0 | literals.rb:184:16:185:11 | \n text with  | StringTextComponent |
+| literals.rb:184:9:184:15 | <<"DOC" | HereDoc | 1 | literals.rb:185:12:185:29 | #{...} | StringInterpolationComponent |
+| literals.rb:184:9:184:15 | <<"DOC" | HereDoc | 2 | literals.rb:185:30:185:32 |  !\n | StringTextComponent |
+| literals.rb:189:9:189:15 | <<'DOC' | HereDoc | 0 | literals.rb:189:16:190:14 | \n text without  | StringTextComponent |
+| literals.rb:189:9:189:15 | <<'DOC' | HereDoc | 1 | literals.rb:190:15:190:32 | #{...} | StringInterpolationComponent |
+| literals.rb:189:9:189:15 | <<'DOC' | HereDoc | 2 | literals.rb:190:33:190:35 |  !\n | StringTextComponent |
+| literals.rb:193:10:193:19 | <<`SCRIPT` | HereDoc | 0 | literals.rb:193:20:194:14 | \n cat file.txt\n | StringTextComponent |
 stringInterpolations
-| literals.rb:58:10:58:19 | #{...} | 0 | literals.rb:58:13:58:17 | ... + ... | AddExpr |
-| literals.rb:59:12:59:21 | #{...} | 0 | literals.rb:59:15:59:19 | ... + ... | AddExpr |
-| literals.rb:64:11:64:20 | #{...} | 0 | literals.rb:64:14:64:18 | ... * ... | MulExpr |
-| literals.rb:65:6:65:30 | #{...} | 0 | literals.rb:65:9:65:28 | "bar #{...} baz" | StringLiteral |
-| literals.rb:65:14:65:23 | #{...} | 0 | literals.rb:65:17:65:21 | ... + ... | AddExpr |
-| literals.rb:66:6:66:21 | #{...} | 0 | literals.rb:66:9:66:14 | call to blah | MethodCall |
-| literals.rb:66:6:66:21 | #{...} | 1 | literals.rb:66:17:66:19 | ... + ... | AddExpr |
-| literals.rb:69:6:69:13 | #{...} | 0 | literals.rb:69:9:69:11 | bar | LocalVariableAccess |
-| literals.rb:70:6:70:13 | #{...} | 0 | literals.rb:70:9:70:11 | BAR | ConstantReadAccess |
-| literals.rb:91:7:91:15 | #{...} | 0 | literals.rb:91:10:91:14 | ... + ... | AddExpr |
-| literals.rb:91:17:91:22 | #{...} | 0 | literals.rb:91:19:91:21 | bar | LocalVariableAccess |
-| literals.rb:91:24:91:29 | #{...} | 0 | literals.rb:91:26:91:28 | BAR | ConstantReadAccess |
-| literals.rb:105:11:105:16 | #{...} | 0 | literals.rb:105:13:105:15 | ... + ... | AddExpr |
-| literals.rb:105:18:105:23 | #{...} | 0 | literals.rb:105:20:105:22 | bar | LocalVariableAccess |
-| literals.rb:105:25:105:30 | #{...} | 0 | literals.rb:105:27:105:29 | BAR | ConstantReadAccess |
-| literals.rb:112:11:112:20 | #{...} | 0 | literals.rb:112:14:112:18 | ... + ... | AddExpr |
-| literals.rb:112:22:112:27 | #{...} | 0 | literals.rb:112:24:112:26 | bar | LocalVariableAccess |
-| literals.rb:112:29:112:34 | #{...} | 0 | literals.rb:112:31:112:33 | BAR | ConstantReadAccess |
-| literals.rb:132:8:132:17 | #{...} | 0 | literals.rb:132:11:132:15 | ... + ... | AddExpr |
-| literals.rb:132:19:132:24 | #{...} | 0 | literals.rb:132:21:132:23 | bar | LocalVariableAccess |
-| literals.rb:132:26:132:31 | #{...} | 0 | literals.rb:132:28:132:30 | BAR | ConstantReadAccess |
-| literals.rb:133:10:133:19 | #{...} | 0 | literals.rb:133:13:133:17 | ... - ... | SubExpr |
-| literals.rb:158:14:158:22 | #{...} | 0 | literals.rb:158:17:158:20 | call to name | MethodCall |
-| literals.rb:172:12:172:29 | #{...} | 0 | literals.rb:172:15:172:27 | call to interpolation | MethodCall |
-| literals.rb:177:15:177:32 | #{...} | 0 | literals.rb:177:18:177:30 | call to interpolation | MethodCall |
+| literals.rb:71:10:71:19 | #{...} | 0 | literals.rb:71:13:71:17 | ... + ... | AddExpr |
+| literals.rb:72:12:72:21 | #{...} | 0 | literals.rb:72:15:72:19 | ... + ... | AddExpr |
+| literals.rb:77:11:77:20 | #{...} | 0 | literals.rb:77:14:77:18 | ... * ... | MulExpr |
+| literals.rb:78:6:78:30 | #{...} | 0 | literals.rb:78:9:78:28 | "bar #{...} baz" | StringLiteral |
+| literals.rb:78:14:78:23 | #{...} | 0 | literals.rb:78:17:78:21 | ... + ... | AddExpr |
+| literals.rb:79:6:79:21 | #{...} | 0 | literals.rb:79:9:79:14 | call to blah | MethodCall |
+| literals.rb:79:6:79:21 | #{...} | 1 | literals.rb:79:17:79:19 | ... + ... | AddExpr |
+| literals.rb:82:6:82:13 | #{...} | 0 | literals.rb:82:9:82:11 | bar | LocalVariableAccess |
+| literals.rb:83:6:83:13 | #{...} | 0 | literals.rb:83:9:83:11 | BAR | ConstantReadAccess |
+| literals.rb:104:7:104:15 | #{...} | 0 | literals.rb:104:10:104:14 | ... + ... | AddExpr |
+| literals.rb:104:17:104:22 | #{...} | 0 | literals.rb:104:19:104:21 | bar | LocalVariableAccess |
+| literals.rb:104:24:104:29 | #{...} | 0 | literals.rb:104:26:104:28 | BAR | ConstantReadAccess |
+| literals.rb:118:11:118:16 | #{...} | 0 | literals.rb:118:13:118:15 | ... + ... | AddExpr |
+| literals.rb:118:18:118:23 | #{...} | 0 | literals.rb:118:20:118:22 | bar | LocalVariableAccess |
+| literals.rb:118:25:118:30 | #{...} | 0 | literals.rb:118:27:118:29 | BAR | ConstantReadAccess |
+| literals.rb:125:11:125:20 | #{...} | 0 | literals.rb:125:14:125:18 | ... + ... | AddExpr |
+| literals.rb:125:22:125:27 | #{...} | 0 | literals.rb:125:24:125:26 | bar | LocalVariableAccess |
+| literals.rb:125:29:125:34 | #{...} | 0 | literals.rb:125:31:125:33 | BAR | ConstantReadAccess |
+| literals.rb:145:8:145:17 | #{...} | 0 | literals.rb:145:11:145:15 | ... + ... | AddExpr |
+| literals.rb:145:19:145:24 | #{...} | 0 | literals.rb:145:21:145:23 | bar | LocalVariableAccess |
+| literals.rb:145:26:145:31 | #{...} | 0 | literals.rb:145:28:145:30 | BAR | ConstantReadAccess |
+| literals.rb:146:10:146:19 | #{...} | 0 | literals.rb:146:13:146:17 | ... - ... | SubExpr |
+| literals.rb:171:14:171:22 | #{...} | 0 | literals.rb:171:17:171:20 | call to name | MethodCall |
+| literals.rb:185:12:185:29 | #{...} | 0 | literals.rb:185:15:185:27 | call to interpolation | MethodCall |
+| literals.rb:190:15:190:32 | #{...} | 0 | literals.rb:190:18:190:30 | call to interpolation | MethodCall |
 concatenatedStrings
-| literals.rb:62:1:62:17 | "..." "..." | foobarbaz | 0 | literals.rb:62:1:62:5 | "foo" |
-| literals.rb:62:1:62:17 | "..." "..." | foobarbaz | 1 | literals.rb:62:7:62:11 | "bar" |
-| literals.rb:62:1:62:17 | "..." "..." | foobarbaz | 2 | literals.rb:62:13:62:17 | "baz" |
-| literals.rb:63:1:63:19 | "..." "..." | foobarbaz | 0 | literals.rb:63:1:63:7 | "foo" |
-| literals.rb:63:1:63:19 | "..." "..." | foobarbaz | 1 | literals.rb:63:9:63:13 | "bar" |
-| literals.rb:63:1:63:19 | "..." "..." | foobarbaz | 2 | literals.rb:63:15:63:19 | "baz" |
-| literals.rb:64:1:64:27 | "..." "..." | foobar1baz | 0 | literals.rb:64:1:64:5 | "foo" |
-| literals.rb:64:1:64:27 | "..." "..." | foobar1baz | 1 | literals.rb:64:7:64:21 | "bar#{...}" |
-| literals.rb:64:1:64:27 | "..." "..." | foobar1baz | 2 | literals.rb:64:23:64:27 | "baz" |
+| literals.rb:75:1:75:17 | "..." "..." | foobarbaz | 0 | literals.rb:75:1:75:5 | "foo" |
+| literals.rb:75:1:75:17 | "..." "..." | foobarbaz | 1 | literals.rb:75:7:75:11 | "bar" |
+| literals.rb:75:1:75:17 | "..." "..." | foobarbaz | 2 | literals.rb:75:13:75:17 | "baz" |
+| literals.rb:76:1:76:19 | "..." "..." | foobarbaz | 0 | literals.rb:76:1:76:7 | "foo" |
+| literals.rb:76:1:76:19 | "..." "..." | foobarbaz | 1 | literals.rb:76:9:76:13 | "bar" |
+| literals.rb:76:1:76:19 | "..." "..." | foobarbaz | 2 | literals.rb:76:15:76:19 | "baz" |
+| literals.rb:77:1:77:27 | "..." "..." | foobar1baz | 0 | literals.rb:77:1:77:5 | "foo" |
+| literals.rb:77:1:77:27 | "..." "..." | foobar1baz | 1 | literals.rb:77:7:77:21 | "bar#{...}" |
+| literals.rb:77:1:77:27 | "..." "..." | foobar1baz | 2 | literals.rb:77:23:77:27 | "baz" |
 arrayLiterals
-| literals.rb:96:1:96:2 | [...] | 0 |
-| literals.rb:97:1:97:9 | [...] | 3 |
-| literals.rb:98:1:98:14 | [...] | 3 |
-| literals.rb:99:1:99:11 | [...] | 2 |
-| literals.rb:99:5:99:10 | [...] | 2 |
-| literals.rb:102:1:102:4 | %w(...) | 0 |
-| literals.rb:103:1:103:15 | %w(...) | 3 |
-| literals.rb:104:1:104:15 | %w(...) | 3 |
-| literals.rb:105:1:105:35 | %w(...) | 5 |
-| literals.rb:106:1:106:35 | %w(...) | 5 |
-| literals.rb:109:1:109:4 | %i(...) | 0 |
-| literals.rb:110:1:110:15 | %i(...) | 3 |
-| literals.rb:111:1:111:15 | %i(...) | 3 |
-| literals.rb:112:1:112:39 | %i(...) | 5 |
-| literals.rb:113:1:113:39 | %i(...) | 9 |
+| literals.rb:109:1:109:2 | [...] | 0 |
+| literals.rb:110:1:110:9 | [...] | 3 |
+| literals.rb:111:1:111:14 | [...] | 3 |
+| literals.rb:112:1:112:11 | [...] | 2 |
+| literals.rb:112:5:112:10 | [...] | 2 |
+| literals.rb:115:1:115:4 | %w(...) | 0 |
+| literals.rb:116:1:116:15 | %w(...) | 3 |
+| literals.rb:117:1:117:15 | %w(...) | 3 |
+| literals.rb:118:1:118:35 | %w(...) | 5 |
+| literals.rb:119:1:119:35 | %w(...) | 5 |
+| literals.rb:122:1:122:4 | %i(...) | 0 |
+| literals.rb:123:1:123:15 | %i(...) | 3 |
+| literals.rb:124:1:124:15 | %i(...) | 3 |
+| literals.rb:125:1:125:39 | %i(...) | 5 |
+| literals.rb:126:1:126:39 | %i(...) | 9 |
 arrayLiteralElements
-| literals.rb:97:1:97:9 | [...] | 0 | literals.rb:97:2:97:2 | 1 | IntegerLiteral |
-| literals.rb:97:1:97:9 | [...] | 1 | literals.rb:97:5:97:5 | 2 | IntegerLiteral |
-| literals.rb:97:1:97:9 | [...] | 2 | literals.rb:97:8:97:8 | 3 | IntegerLiteral |
-| literals.rb:98:1:98:14 | [...] | 0 | literals.rb:98:2:98:2 | 4 | IntegerLiteral |
-| literals.rb:98:1:98:14 | [...] | 1 | literals.rb:98:5:98:5 | 5 | IntegerLiteral |
-| literals.rb:98:1:98:14 | [...] | 2 | literals.rb:98:8:98:13 | ... / ... | DivExpr |
-| literals.rb:99:1:99:11 | [...] | 0 | literals.rb:99:2:99:2 | 7 | IntegerLiteral |
-| literals.rb:99:1:99:11 | [...] | 1 | literals.rb:99:5:99:10 | [...] | ArrayLiteral |
-| literals.rb:99:5:99:10 | [...] | 0 | literals.rb:99:6:99:6 | 8 | IntegerLiteral |
-| literals.rb:99:5:99:10 | [...] | 1 | literals.rb:99:9:99:9 | 9 | IntegerLiteral |
-| literals.rb:103:1:103:15 | %w(...) | 0 | literals.rb:103:4:103:6 | "foo" | StringLiteral |
-| literals.rb:103:1:103:15 | %w(...) | 1 | literals.rb:103:8:103:10 | "bar" | StringLiteral |
-| literals.rb:103:1:103:15 | %w(...) | 2 | literals.rb:103:12:103:14 | "baz" | StringLiteral |
-| literals.rb:104:1:104:15 | %w(...) | 0 | literals.rb:104:4:104:6 | "foo" | StringLiteral |
-| literals.rb:104:1:104:15 | %w(...) | 1 | literals.rb:104:8:104:10 | "bar" | StringLiteral |
-| literals.rb:104:1:104:15 | %w(...) | 2 | literals.rb:104:12:104:14 | "baz" | StringLiteral |
-| literals.rb:105:1:105:35 | %w(...) | 0 | literals.rb:105:4:105:6 | "foo" | StringLiteral |
-| literals.rb:105:1:105:35 | %w(...) | 1 | literals.rb:105:8:105:16 | "bar#{...}" | StringLiteral |
-| literals.rb:105:1:105:35 | %w(...) | 2 | literals.rb:105:18:105:23 | "#{...}" | StringLiteral |
-| literals.rb:105:1:105:35 | %w(...) | 3 | literals.rb:105:25:105:30 | "#{...}" | StringLiteral |
-| literals.rb:105:1:105:35 | %w(...) | 4 | literals.rb:105:32:105:34 | "baz" | StringLiteral |
-| literals.rb:106:1:106:35 | %w(...) | 0 | literals.rb:106:4:106:6 | "foo" | StringLiteral |
-| literals.rb:106:1:106:35 | %w(...) | 1 | literals.rb:106:8:106:16 | "bar#{1+1}" | StringLiteral |
-| literals.rb:106:1:106:35 | %w(...) | 2 | literals.rb:106:18:106:23 | "#{bar}" | StringLiteral |
-| literals.rb:106:1:106:35 | %w(...) | 3 | literals.rb:106:25:106:30 | "#{BAR}" | StringLiteral |
-| literals.rb:106:1:106:35 | %w(...) | 4 | literals.rb:106:32:106:34 | "baz" | StringLiteral |
-| literals.rb:110:1:110:15 | %i(...) | 0 | literals.rb:110:4:110:6 | :"foo" | SymbolLiteral |
-| literals.rb:110:1:110:15 | %i(...) | 1 | literals.rb:110:8:110:10 | :"bar" | SymbolLiteral |
-| literals.rb:110:1:110:15 | %i(...) | 2 | literals.rb:110:12:110:14 | :"baz" | SymbolLiteral |
-| literals.rb:111:1:111:15 | %i(...) | 0 | literals.rb:111:4:111:6 | :"foo" | SymbolLiteral |
-| literals.rb:111:1:111:15 | %i(...) | 1 | literals.rb:111:8:111:10 | :"bar" | SymbolLiteral |
-| literals.rb:111:1:111:15 | %i(...) | 2 | literals.rb:111:12:111:14 | :"baz" | SymbolLiteral |
-| literals.rb:112:1:112:39 | %i(...) | 0 | literals.rb:112:4:112:6 | :"foo" | SymbolLiteral |
-| literals.rb:112:1:112:39 | %i(...) | 1 | literals.rb:112:8:112:20 | :"bar#{...}" | SymbolLiteral |
-| literals.rb:112:1:112:39 | %i(...) | 2 | literals.rb:112:22:112:27 | :"#{...}" | SymbolLiteral |
-| literals.rb:112:1:112:39 | %i(...) | 3 | literals.rb:112:29:112:34 | :"#{...}" | SymbolLiteral |
-| literals.rb:112:1:112:39 | %i(...) | 4 | literals.rb:112:36:112:38 | :"baz" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 0 | literals.rb:113:4:113:6 | :"foo" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 1 | literals.rb:113:8:113:12 | :"bar#{" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 2 | literals.rb:113:14:113:14 | :"2" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 3 | literals.rb:113:16:113:16 | :"+" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 4 | literals.rb:113:18:113:18 | :"4" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 5 | literals.rb:113:20:113:20 | :"}" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 6 | literals.rb:113:22:113:27 | :"#{bar}" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 7 | literals.rb:113:29:113:34 | :"#{BAR}" | SymbolLiteral |
-| literals.rb:113:1:113:39 | %i(...) | 8 | literals.rb:113:36:113:38 | :"baz" | SymbolLiteral |
+| literals.rb:110:1:110:9 | [...] | 0 | literals.rb:110:2:110:2 | 1 | IntegerLiteral |
+| literals.rb:110:1:110:9 | [...] | 1 | literals.rb:110:5:110:5 | 2 | IntegerLiteral |
+| literals.rb:110:1:110:9 | [...] | 2 | literals.rb:110:8:110:8 | 3 | IntegerLiteral |
+| literals.rb:111:1:111:14 | [...] | 0 | literals.rb:111:2:111:2 | 4 | IntegerLiteral |
+| literals.rb:111:1:111:14 | [...] | 1 | literals.rb:111:5:111:5 | 5 | IntegerLiteral |
+| literals.rb:111:1:111:14 | [...] | 2 | literals.rb:111:8:111:13 | ... / ... | DivExpr |
+| literals.rb:112:1:112:11 | [...] | 0 | literals.rb:112:2:112:2 | 7 | IntegerLiteral |
+| literals.rb:112:1:112:11 | [...] | 1 | literals.rb:112:5:112:10 | [...] | ArrayLiteral |
+| literals.rb:112:5:112:10 | [...] | 0 | literals.rb:112:6:112:6 | 8 | IntegerLiteral |
+| literals.rb:112:5:112:10 | [...] | 1 | literals.rb:112:9:112:9 | 9 | IntegerLiteral |
+| literals.rb:116:1:116:15 | %w(...) | 0 | literals.rb:116:4:116:6 | "foo" | StringLiteral |
+| literals.rb:116:1:116:15 | %w(...) | 1 | literals.rb:116:8:116:10 | "bar" | StringLiteral |
+| literals.rb:116:1:116:15 | %w(...) | 2 | literals.rb:116:12:116:14 | "baz" | StringLiteral |
+| literals.rb:117:1:117:15 | %w(...) | 0 | literals.rb:117:4:117:6 | "foo" | StringLiteral |
+| literals.rb:117:1:117:15 | %w(...) | 1 | literals.rb:117:8:117:10 | "bar" | StringLiteral |
+| literals.rb:117:1:117:15 | %w(...) | 2 | literals.rb:117:12:117:14 | "baz" | StringLiteral |
+| literals.rb:118:1:118:35 | %w(...) | 0 | literals.rb:118:4:118:6 | "foo" | StringLiteral |
+| literals.rb:118:1:118:35 | %w(...) | 1 | literals.rb:118:8:118:16 | "bar#{...}" | StringLiteral |
+| literals.rb:118:1:118:35 | %w(...) | 2 | literals.rb:118:18:118:23 | "#{...}" | StringLiteral |
+| literals.rb:118:1:118:35 | %w(...) | 3 | literals.rb:118:25:118:30 | "#{...}" | StringLiteral |
+| literals.rb:118:1:118:35 | %w(...) | 4 | literals.rb:118:32:118:34 | "baz" | StringLiteral |
+| literals.rb:119:1:119:35 | %w(...) | 0 | literals.rb:119:4:119:6 | "foo" | StringLiteral |
+| literals.rb:119:1:119:35 | %w(...) | 1 | literals.rb:119:8:119:16 | "bar#{1+1}" | StringLiteral |
+| literals.rb:119:1:119:35 | %w(...) | 2 | literals.rb:119:18:119:23 | "#{bar}" | StringLiteral |
+| literals.rb:119:1:119:35 | %w(...) | 3 | literals.rb:119:25:119:30 | "#{BAR}" | StringLiteral |
+| literals.rb:119:1:119:35 | %w(...) | 4 | literals.rb:119:32:119:34 | "baz" | StringLiteral |
+| literals.rb:123:1:123:15 | %i(...) | 0 | literals.rb:123:4:123:6 | :"foo" | SymbolLiteral |
+| literals.rb:123:1:123:15 | %i(...) | 1 | literals.rb:123:8:123:10 | :"bar" | SymbolLiteral |
+| literals.rb:123:1:123:15 | %i(...) | 2 | literals.rb:123:12:123:14 | :"baz" | SymbolLiteral |
+| literals.rb:124:1:124:15 | %i(...) | 0 | literals.rb:124:4:124:6 | :"foo" | SymbolLiteral |
+| literals.rb:124:1:124:15 | %i(...) | 1 | literals.rb:124:8:124:10 | :"bar" | SymbolLiteral |
+| literals.rb:124:1:124:15 | %i(...) | 2 | literals.rb:124:12:124:14 | :"baz" | SymbolLiteral |
+| literals.rb:125:1:125:39 | %i(...) | 0 | literals.rb:125:4:125:6 | :"foo" | SymbolLiteral |
+| literals.rb:125:1:125:39 | %i(...) | 1 | literals.rb:125:8:125:20 | :"bar#{...}" | SymbolLiteral |
+| literals.rb:125:1:125:39 | %i(...) | 2 | literals.rb:125:22:125:27 | :"#{...}" | SymbolLiteral |
+| literals.rb:125:1:125:39 | %i(...) | 3 | literals.rb:125:29:125:34 | :"#{...}" | SymbolLiteral |
+| literals.rb:125:1:125:39 | %i(...) | 4 | literals.rb:125:36:125:38 | :"baz" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 0 | literals.rb:126:4:126:6 | :"foo" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 1 | literals.rb:126:8:126:12 | :"bar#{" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 2 | literals.rb:126:14:126:14 | :"2" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 3 | literals.rb:126:16:126:16 | :"+" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 4 | literals.rb:126:18:126:18 | :"4" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 5 | literals.rb:126:20:126:20 | :"}" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 6 | literals.rb:126:22:126:27 | :"#{bar}" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 7 | literals.rb:126:29:126:34 | :"#{BAR}" | SymbolLiteral |
+| literals.rb:126:1:126:39 | %i(...) | 8 | literals.rb:126:36:126:38 | :"baz" | SymbolLiteral |
 hashLiterals
-| literals.rb:88:1:88:14 | {...} | 1 |
-| literals.rb:116:1:116:2 | {...} | 0 |
-| literals.rb:117:1:117:33 | {...} | 3 |
-| literals.rb:118:1:118:17 | {...} | 2 |
-| literals.rb:185:1:185:9 | {...} | 2 |
-| literals.rb:186:1:186:9 | {...} | 2 |
+| literals.rb:101:1:101:14 | {...} | 1 |
+| literals.rb:129:1:129:2 | {...} | 0 |
+| literals.rb:130:1:130:33 | {...} | 3 |
+| literals.rb:131:1:131:17 | {...} | 2 |
+| literals.rb:198:1:198:9 | {...} | 2 |
+| literals.rb:199:1:199:9 | {...} | 2 |
 hashLiteralElements
-| literals.rb:88:1:88:14 | {...} | 0 | literals.rb:88:3:88:12 | Pair | Pair |
-| literals.rb:117:1:117:33 | {...} | 0 | literals.rb:117:3:117:8 | Pair | Pair |
-| literals.rb:117:1:117:33 | {...} | 1 | literals.rb:117:11:117:19 | Pair | Pair |
-| literals.rb:117:1:117:33 | {...} | 2 | literals.rb:117:22:117:31 | Pair | Pair |
-| literals.rb:118:1:118:17 | {...} | 0 | literals.rb:118:3:118:8 | Pair | Pair |
-| literals.rb:118:1:118:17 | {...} | 1 | literals.rb:118:11:118:15 | ** ... | HashSplatExpr |
-| literals.rb:185:1:185:9 | {...} | 0 | literals.rb:185:2:185:3 | Pair | Pair |
-| literals.rb:185:1:185:9 | {...} | 1 | literals.rb:185:6:185:8 | Pair | Pair |
-| literals.rb:186:1:186:9 | {...} | 0 | literals.rb:186:2:186:3 | Pair | Pair |
-| literals.rb:186:1:186:9 | {...} | 1 | literals.rb:186:7:186:8 | Pair | Pair |
+| literals.rb:101:1:101:14 | {...} | 0 | literals.rb:101:3:101:12 | Pair | Pair |
+| literals.rb:130:1:130:33 | {...} | 0 | literals.rb:130:3:130:8 | Pair | Pair |
+| literals.rb:130:1:130:33 | {...} | 1 | literals.rb:130:11:130:19 | Pair | Pair |
+| literals.rb:130:1:130:33 | {...} | 2 | literals.rb:130:22:130:31 | Pair | Pair |
+| literals.rb:131:1:131:17 | {...} | 0 | literals.rb:131:3:131:8 | Pair | Pair |
+| literals.rb:131:1:131:17 | {...} | 1 | literals.rb:131:11:131:15 | ** ... | HashSplatExpr |
+| literals.rb:198:1:198:9 | {...} | 0 | literals.rb:198:2:198:3 | Pair | Pair |
+| literals.rb:198:1:198:9 | {...} | 1 | literals.rb:198:6:198:8 | Pair | Pair |
+| literals.rb:199:1:199:9 | {...} | 0 | literals.rb:199:2:199:3 | Pair | Pair |
+| literals.rb:199:1:199:9 | {...} | 1 | literals.rb:199:7:199:8 | Pair | Pair |
 hashLiteralKeyValuePairs
-| literals.rb:88:1:88:14 | {...} | literals.rb:88:3:88:12 | Pair | literals.rb:88:3:88:5 | :foo | literals.rb:88:8:88:12 | "bar" |
-| literals.rb:117:1:117:33 | {...} | literals.rb:117:3:117:8 | Pair | literals.rb:117:3:117:5 | :foo | literals.rb:117:8:117:8 | 1 |
-| literals.rb:117:1:117:33 | {...} | literals.rb:117:11:117:19 | Pair | literals.rb:117:11:117:14 | :bar | literals.rb:117:19:117:19 | 2 |
-| literals.rb:117:1:117:33 | {...} | literals.rb:117:22:117:31 | Pair | literals.rb:117:22:117:26 | "baz" | literals.rb:117:31:117:31 | 3 |
-| literals.rb:118:1:118:17 | {...} | literals.rb:118:3:118:8 | Pair | literals.rb:118:3:118:5 | :foo | literals.rb:118:8:118:8 | 7 |
-| literals.rb:185:1:185:9 | {...} | literals.rb:185:2:185:3 | Pair | literals.rb:185:2:185:2 | :x | literals.rb:185:2:185:2 | x |
-| literals.rb:185:1:185:9 | {...} | literals.rb:185:6:185:8 | Pair | literals.rb:185:6:185:6 | :y | literals.rb:185:8:185:8 | 5 |
-| literals.rb:186:1:186:9 | {...} | literals.rb:186:2:186:3 | Pair | literals.rb:186:2:186:2 | :y | literals.rb:186:2:186:2 | call to y |
-| literals.rb:186:1:186:9 | {...} | literals.rb:186:7:186:8 | Pair | literals.rb:186:7:186:7 | :Z | literals.rb:186:7:186:7 | Z |
+| literals.rb:101:1:101:14 | {...} | literals.rb:101:3:101:12 | Pair | literals.rb:101:3:101:5 | :foo | literals.rb:101:8:101:12 | "bar" |
+| literals.rb:130:1:130:33 | {...} | literals.rb:130:3:130:8 | Pair | literals.rb:130:3:130:5 | :foo | literals.rb:130:8:130:8 | 1 |
+| literals.rb:130:1:130:33 | {...} | literals.rb:130:11:130:19 | Pair | literals.rb:130:11:130:14 | :bar | literals.rb:130:19:130:19 | 2 |
+| literals.rb:130:1:130:33 | {...} | literals.rb:130:22:130:31 | Pair | literals.rb:130:22:130:26 | "baz" | literals.rb:130:31:130:31 | 3 |
+| literals.rb:131:1:131:17 | {...} | literals.rb:131:3:131:8 | Pair | literals.rb:131:3:131:5 | :foo | literals.rb:131:8:131:8 | 7 |
+| literals.rb:198:1:198:9 | {...} | literals.rb:198:2:198:3 | Pair | literals.rb:198:2:198:2 | :x | literals.rb:198:2:198:2 | x |
+| literals.rb:198:1:198:9 | {...} | literals.rb:198:6:198:8 | Pair | literals.rb:198:6:198:6 | :y | literals.rb:198:8:198:8 | 5 |
+| literals.rb:199:1:199:9 | {...} | literals.rb:199:2:199:3 | Pair | literals.rb:199:2:199:2 | :y | literals.rb:199:2:199:2 | call to y |
+| literals.rb:199:1:199:9 | {...} | literals.rb:199:7:199:8 | Pair | literals.rb:199:7:199:7 | :Z | literals.rb:199:7:199:7 | Z |
 finiteRangeLiterals
-| literals.rb:121:2:121:6 | _ .. _ | literals.rb:121:2:121:2 | 1 | literals.rb:121:5:121:6 | 10 |
-| literals.rb:122:2:122:7 | _ ... _ | literals.rb:122:2:122:2 | 1 | literals.rb:122:6:122:7 | 10 |
-| literals.rb:123:2:123:7 | _ .. _ | literals.rb:123:2:123:2 | 1 | literals.rb:123:7:123:7 | 0 |
-| literals.rb:124:2:124:11 | _ .. _ | literals.rb:124:2:124:6 | call to start | literals.rb:124:9:124:11 | ... + ... |
+| literals.rb:134:2:134:6 | _ .. _ | literals.rb:134:2:134:2 | 1 | literals.rb:134:5:134:6 | 10 |
+| literals.rb:135:2:135:7 | _ ... _ | literals.rb:135:2:135:2 | 1 | literals.rb:135:6:135:7 | 10 |
+| literals.rb:136:2:136:7 | _ .. _ | literals.rb:136:2:136:2 | 1 | literals.rb:136:7:136:7 | 0 |
+| literals.rb:137:2:137:11 | _ .. _ | literals.rb:137:2:137:6 | call to start | literals.rb:137:9:137:11 | ... + ... |
 beginlessRangeLiterals
-| literals.rb:126:2:126:4 | _ .. _ | literals.rb:126:4:126:4 | 1 |
+| literals.rb:139:2:139:4 | _ .. _ | literals.rb:139:4:139:4 | 1 |
 endlessRangeLiterals
-| literals.rb:125:2:125:4 | _ .. _ | literals.rb:125:2:125:2 | 1 |
-| literals.rb:127:2:127:4 | _ .. _ | literals.rb:127:2:127:2 | 0 |
+| literals.rb:138:2:138:4 | _ .. _ | literals.rb:138:2:138:2 | 1 |
+| literals.rb:140:2:140:4 | _ .. _ | literals.rb:140:2:140:2 | 0 |
 inclusiveRangeLiterals
-| literals.rb:121:2:121:6 | _ .. _ |
-| literals.rb:123:2:123:7 | _ .. _ |
-| literals.rb:124:2:124:11 | _ .. _ |
-| literals.rb:125:2:125:4 | _ .. _ |
-| literals.rb:126:2:126:4 | _ .. _ |
-| literals.rb:127:2:127:4 | _ .. _ |
+| literals.rb:134:2:134:6 | _ .. _ |
+| literals.rb:136:2:136:7 | _ .. _ |
+| literals.rb:137:2:137:11 | _ .. _ |
+| literals.rb:138:2:138:4 | _ .. _ |
+| literals.rb:139:2:139:4 | _ .. _ |
+| literals.rb:140:2:140:4 | _ .. _ |
 exclusiveRangeLiterals
-| literals.rb:122:2:122:7 | _ ... _ |
+| literals.rb:135:2:135:7 | _ ... _ |
 numericLiterals
 | literals.rb:10:1:10:4 | 1234 | IntegerLiteral | 1234 |
 | literals.rb:11:1:11:5 | 5_678 | IntegerLiteral | 5678 |
 | literals.rb:12:1:12:1 | 0 | IntegerLiteral | 0 |
 | literals.rb:13:1:13:5 | 0d900 | IntegerLiteral | 0 |
-| literals.rb:16:1:16:6 | 0x1234 | IntegerLiteral | 4660 |
-| literals.rb:17:1:17:10 | 0xdeadbeef | IntegerLiteral | -559038737 |
-| literals.rb:18:1:18:11 | 0xF00D_face | IntegerLiteral | -267519282 |
-| literals.rb:21:1:21:4 | 0123 | IntegerLiteral | 83 |
-| literals.rb:22:1:22:5 | 0o234 | IntegerLiteral | 156 |
-| literals.rb:23:1:23:6 | 0O45_6 | IntegerLiteral | 302 |
-| literals.rb:26:1:26:10 | 0b10010100 | IntegerLiteral | 148 |
-| literals.rb:27:1:27:11 | 0B011_01101 | IntegerLiteral | 109 |
-| literals.rb:30:1:30:5 | 12.34 | FloatLiteral | 12.34 |
-| literals.rb:31:1:31:7 | 1234e-2 | FloatLiteral | 12.34 |
-| literals.rb:32:1:32:7 | 1.234E1 | FloatLiteral | 12.34 |
-| literals.rb:35:1:35:3 | 23r | RationalLiteral | 23/1 |
-| literals.rb:36:1:36:5 | 9.85r | RationalLiteral | 985/100 |
-| literals.rb:39:1:39:2 | 2i | ComplexLiteral | 0+2i |
-| literals.rb:58:13:58:13 | 2 | IntegerLiteral | 2 |
-| literals.rb:58:17:58:17 | 2 | IntegerLiteral | 2 |
-| literals.rb:59:15:59:15 | 3 | IntegerLiteral | 3 |
-| literals.rb:59:19:59:19 | 4 | IntegerLiteral | 4 |
-| literals.rb:64:14:64:14 | 1 | IntegerLiteral | 1 |
-| literals.rb:64:18:64:18 | 1 | IntegerLiteral | 1 |
-| literals.rb:65:17:65:17 | 2 | IntegerLiteral | 2 |
-| literals.rb:65:21:65:21 | 3 | IntegerLiteral | 3 |
-| literals.rb:66:17:66:17 | 1 | IntegerLiteral | 1 |
-| literals.rb:66:19:66:19 | 9 | IntegerLiteral | 9 |
-| literals.rb:91:10:91:10 | 2 | IntegerLiteral | 2 |
-| literals.rb:91:14:91:14 | 2 | IntegerLiteral | 2 |
-| literals.rb:97:2:97:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:97:5:97:5 | 2 | IntegerLiteral | 2 |
-| literals.rb:97:8:97:8 | 3 | IntegerLiteral | 3 |
-| literals.rb:98:2:98:2 | 4 | IntegerLiteral | 4 |
-| literals.rb:98:5:98:5 | 5 | IntegerLiteral | 5 |
-| literals.rb:98:8:98:9 | 12 | IntegerLiteral | 12 |
-| literals.rb:98:13:98:13 | 2 | IntegerLiteral | 2 |
-| literals.rb:99:2:99:2 | 7 | IntegerLiteral | 7 |
-| literals.rb:99:6:99:6 | 8 | IntegerLiteral | 8 |
-| literals.rb:99:9:99:9 | 9 | IntegerLiteral | 9 |
-| literals.rb:105:13:105:13 | 1 | IntegerLiteral | 1 |
-| literals.rb:105:15:105:15 | 1 | IntegerLiteral | 1 |
-| literals.rb:112:14:112:14 | 2 | IntegerLiteral | 2 |
-| literals.rb:112:18:112:18 | 4 | IntegerLiteral | 4 |
-| literals.rb:117:8:117:8 | 1 | IntegerLiteral | 1 |
-| literals.rb:117:19:117:19 | 2 | IntegerLiteral | 2 |
-| literals.rb:117:31:117:31 | 3 | IntegerLiteral | 3 |
-| literals.rb:118:8:118:8 | 7 | IntegerLiteral | 7 |
-| literals.rb:121:2:121:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:121:5:121:6 | 10 | IntegerLiteral | 10 |
-| literals.rb:122:2:122:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:122:6:122:7 | 10 | IntegerLiteral | 10 |
-| literals.rb:123:2:123:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:123:7:123:7 | 0 | IntegerLiteral | 0 |
-| literals.rb:124:9:124:9 | 2 | IntegerLiteral | 2 |
-| literals.rb:124:11:124:11 | 3 | IntegerLiteral | 3 |
-| literals.rb:125:2:125:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:126:4:126:4 | 1 | IntegerLiteral | 1 |
-| literals.rb:127:2:127:2 | 0 | IntegerLiteral | 0 |
-| literals.rb:127:6:127:6 | 1 | IntegerLiteral | 1 |
-| literals.rb:132:11:132:11 | 1 | IntegerLiteral | 1 |
-| literals.rb:132:15:132:15 | 1 | IntegerLiteral | 1 |
-| literals.rb:133:13:133:13 | 5 | IntegerLiteral | 5 |
-| literals.rb:133:17:133:17 | 4 | IntegerLiteral | 4 |
-| literals.rb:140:8:140:8 | 1 | IntegerLiteral | 1 |
-| literals.rb:140:12:140:12 | 1 | IntegerLiteral | 1 |
-| literals.rb:146:10:146:10 | 1 | IntegerLiteral | 1 |
-| literals.rb:146:14:146:14 | 1 | IntegerLiteral | 1 |
-| literals.rb:184:5:184:6 | 42 | IntegerLiteral | 42 |
-| literals.rb:185:8:185:8 | 5 | IntegerLiteral | 5 |
+| literals.rb:14:1:14:10 | 2147483647 | IntegerLiteral | 2147483647 |
+| literals.rb:15:1:15:10 | 2147483648 | IntegerLiteral | <none> |
+| literals.rb:18:1:18:6 | 0x1234 | IntegerLiteral | 4660 |
+| literals.rb:19:1:19:6 | 0xbeef | IntegerLiteral | 48879 |
+| literals.rb:20:1:20:7 | 0xF0_0D | IntegerLiteral | 61453 |
+| literals.rb:21:1:21:22 | 0x000000000000000000ff | IntegerLiteral | 255 |
+| literals.rb:22:1:22:11 | 0x7FFF_FFFF | IntegerLiteral | 2147483647 |
+| literals.rb:23:1:23:10 | 0x80000000 | IntegerLiteral | <none> |
+| literals.rb:24:1:24:10 | 0xdeadbeef | IntegerLiteral | <none> |
+| literals.rb:25:1:25:11 | 0xF00D_face | IntegerLiteral | <none> |
+| literals.rb:28:1:28:4 | 0123 | IntegerLiteral | 83 |
+| literals.rb:29:1:29:5 | 0o234 | IntegerLiteral | 156 |
+| literals.rb:30:1:30:6 | 0O45_6 | IntegerLiteral | 302 |
+| literals.rb:31:1:31:31 | 0000000000000000000000000000010 | IntegerLiteral | 8 |
+| literals.rb:32:1:32:12 | 017777777777 | IntegerLiteral | 2147483647 |
+| literals.rb:33:1:33:12 | 020000000000 | IntegerLiteral | <none> |
+| literals.rb:36:1:36:10 | 0b10010100 | IntegerLiteral | 148 |
+| literals.rb:37:1:37:11 | 0B011_01101 | IntegerLiteral | 109 |
+| literals.rb:38:1:38:43 | 0b00000000000000000000000000000000000000011 | IntegerLiteral | 3 |
+| literals.rb:39:1:39:34 | 0b01111111111111111111111111111111 | IntegerLiteral | 2147483647 |
+| literals.rb:40:1:40:34 | 0b10000000000000000000000000000000 | IntegerLiteral | <none> |
+| literals.rb:43:1:43:5 | 12.34 | FloatLiteral | 12.34 |
+| literals.rb:44:1:44:7 | 1234e-2 | FloatLiteral | 12.34 |
+| literals.rb:45:1:45:7 | 1.234E1 | FloatLiteral | 12.34 |
+| literals.rb:48:1:48:3 | 23r | RationalLiteral | 23/1 |
+| literals.rb:49:1:49:5 | 9.85r | RationalLiteral | 985/100 |
+| literals.rb:52:1:52:2 | 2i | ComplexLiteral | 0+2i |
+| literals.rb:71:13:71:13 | 2 | IntegerLiteral | 2 |
+| literals.rb:71:17:71:17 | 2 | IntegerLiteral | 2 |
+| literals.rb:72:15:72:15 | 3 | IntegerLiteral | 3 |
+| literals.rb:72:19:72:19 | 4 | IntegerLiteral | 4 |
+| literals.rb:77:14:77:14 | 1 | IntegerLiteral | 1 |
+| literals.rb:77:18:77:18 | 1 | IntegerLiteral | 1 |
+| literals.rb:78:17:78:17 | 2 | IntegerLiteral | 2 |
+| literals.rb:78:21:78:21 | 3 | IntegerLiteral | 3 |
+| literals.rb:79:17:79:17 | 1 | IntegerLiteral | 1 |
+| literals.rb:79:19:79:19 | 9 | IntegerLiteral | 9 |
+| literals.rb:104:10:104:10 | 2 | IntegerLiteral | 2 |
+| literals.rb:104:14:104:14 | 2 | IntegerLiteral | 2 |
+| literals.rb:110:2:110:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:110:5:110:5 | 2 | IntegerLiteral | 2 |
+| literals.rb:110:8:110:8 | 3 | IntegerLiteral | 3 |
+| literals.rb:111:2:111:2 | 4 | IntegerLiteral | 4 |
+| literals.rb:111:5:111:5 | 5 | IntegerLiteral | 5 |
+| literals.rb:111:8:111:9 | 12 | IntegerLiteral | 12 |
+| literals.rb:111:13:111:13 | 2 | IntegerLiteral | 2 |
+| literals.rb:112:2:112:2 | 7 | IntegerLiteral | 7 |
+| literals.rb:112:6:112:6 | 8 | IntegerLiteral | 8 |
+| literals.rb:112:9:112:9 | 9 | IntegerLiteral | 9 |
+| literals.rb:118:13:118:13 | 1 | IntegerLiteral | 1 |
+| literals.rb:118:15:118:15 | 1 | IntegerLiteral | 1 |
+| literals.rb:125:14:125:14 | 2 | IntegerLiteral | 2 |
+| literals.rb:125:18:125:18 | 4 | IntegerLiteral | 4 |
+| literals.rb:130:8:130:8 | 1 | IntegerLiteral | 1 |
+| literals.rb:130:19:130:19 | 2 | IntegerLiteral | 2 |
+| literals.rb:130:31:130:31 | 3 | IntegerLiteral | 3 |
+| literals.rb:131:8:131:8 | 7 | IntegerLiteral | 7 |
+| literals.rb:134:2:134:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:134:5:134:6 | 10 | IntegerLiteral | 10 |
+| literals.rb:135:2:135:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:135:6:135:7 | 10 | IntegerLiteral | 10 |
+| literals.rb:136:2:136:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:136:7:136:7 | 0 | IntegerLiteral | 0 |
+| literals.rb:137:9:137:9 | 2 | IntegerLiteral | 2 |
+| literals.rb:137:11:137:11 | 3 | IntegerLiteral | 3 |
+| literals.rb:138:2:138:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:139:4:139:4 | 1 | IntegerLiteral | 1 |
+| literals.rb:140:2:140:2 | 0 | IntegerLiteral | 0 |
+| literals.rb:140:6:140:6 | 1 | IntegerLiteral | 1 |
+| literals.rb:145:11:145:11 | 1 | IntegerLiteral | 1 |
+| literals.rb:145:15:145:15 | 1 | IntegerLiteral | 1 |
+| literals.rb:146:13:146:13 | 5 | IntegerLiteral | 5 |
+| literals.rb:146:17:146:17 | 4 | IntegerLiteral | 4 |
+| literals.rb:153:8:153:8 | 1 | IntegerLiteral | 1 |
+| literals.rb:153:12:153:12 | 1 | IntegerLiteral | 1 |
+| literals.rb:159:10:159:10 | 1 | IntegerLiteral | 1 |
+| literals.rb:159:14:159:14 | 1 | IntegerLiteral | 1 |
+| literals.rb:197:5:197:6 | 42 | IntegerLiteral | 42 |
+| literals.rb:198:8:198:8 | 5 | IntegerLiteral | 5 |
 integerLiterals
 | literals.rb:10:1:10:4 | 1234 | IntegerLiteral | 1234 |
 | literals.rb:11:1:11:5 | 5_678 | IntegerLiteral | 5678 |
 | literals.rb:12:1:12:1 | 0 | IntegerLiteral | 0 |
 | literals.rb:13:1:13:5 | 0d900 | IntegerLiteral | 0 |
-| literals.rb:16:1:16:6 | 0x1234 | IntegerLiteral | 4660 |
-| literals.rb:17:1:17:10 | 0xdeadbeef | IntegerLiteral | -559038737 |
-| literals.rb:18:1:18:11 | 0xF00D_face | IntegerLiteral | -267519282 |
-| literals.rb:21:1:21:4 | 0123 | IntegerLiteral | 83 |
-| literals.rb:22:1:22:5 | 0o234 | IntegerLiteral | 156 |
-| literals.rb:23:1:23:6 | 0O45_6 | IntegerLiteral | 302 |
-| literals.rb:26:1:26:10 | 0b10010100 | IntegerLiteral | 148 |
-| literals.rb:27:1:27:11 | 0B011_01101 | IntegerLiteral | 109 |
-| literals.rb:58:13:58:13 | 2 | IntegerLiteral | 2 |
-| literals.rb:58:17:58:17 | 2 | IntegerLiteral | 2 |
-| literals.rb:59:15:59:15 | 3 | IntegerLiteral | 3 |
-| literals.rb:59:19:59:19 | 4 | IntegerLiteral | 4 |
-| literals.rb:64:14:64:14 | 1 | IntegerLiteral | 1 |
-| literals.rb:64:18:64:18 | 1 | IntegerLiteral | 1 |
-| literals.rb:65:17:65:17 | 2 | IntegerLiteral | 2 |
-| literals.rb:65:21:65:21 | 3 | IntegerLiteral | 3 |
-| literals.rb:66:17:66:17 | 1 | IntegerLiteral | 1 |
-| literals.rb:66:19:66:19 | 9 | IntegerLiteral | 9 |
-| literals.rb:91:10:91:10 | 2 | IntegerLiteral | 2 |
-| literals.rb:91:14:91:14 | 2 | IntegerLiteral | 2 |
-| literals.rb:97:2:97:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:97:5:97:5 | 2 | IntegerLiteral | 2 |
-| literals.rb:97:8:97:8 | 3 | IntegerLiteral | 3 |
-| literals.rb:98:2:98:2 | 4 | IntegerLiteral | 4 |
-| literals.rb:98:5:98:5 | 5 | IntegerLiteral | 5 |
-| literals.rb:98:8:98:9 | 12 | IntegerLiteral | 12 |
-| literals.rb:98:13:98:13 | 2 | IntegerLiteral | 2 |
-| literals.rb:99:2:99:2 | 7 | IntegerLiteral | 7 |
-| literals.rb:99:6:99:6 | 8 | IntegerLiteral | 8 |
-| literals.rb:99:9:99:9 | 9 | IntegerLiteral | 9 |
-| literals.rb:105:13:105:13 | 1 | IntegerLiteral | 1 |
-| literals.rb:105:15:105:15 | 1 | IntegerLiteral | 1 |
-| literals.rb:112:14:112:14 | 2 | IntegerLiteral | 2 |
-| literals.rb:112:18:112:18 | 4 | IntegerLiteral | 4 |
-| literals.rb:117:8:117:8 | 1 | IntegerLiteral | 1 |
-| literals.rb:117:19:117:19 | 2 | IntegerLiteral | 2 |
-| literals.rb:117:31:117:31 | 3 | IntegerLiteral | 3 |
-| literals.rb:118:8:118:8 | 7 | IntegerLiteral | 7 |
-| literals.rb:121:2:121:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:121:5:121:6 | 10 | IntegerLiteral | 10 |
-| literals.rb:122:2:122:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:122:6:122:7 | 10 | IntegerLiteral | 10 |
-| literals.rb:123:2:123:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:123:7:123:7 | 0 | IntegerLiteral | 0 |
-| literals.rb:124:9:124:9 | 2 | IntegerLiteral | 2 |
-| literals.rb:124:11:124:11 | 3 | IntegerLiteral | 3 |
-| literals.rb:125:2:125:2 | 1 | IntegerLiteral | 1 |
-| literals.rb:126:4:126:4 | 1 | IntegerLiteral | 1 |
-| literals.rb:127:2:127:2 | 0 | IntegerLiteral | 0 |
-| literals.rb:127:6:127:6 | 1 | IntegerLiteral | 1 |
-| literals.rb:132:11:132:11 | 1 | IntegerLiteral | 1 |
-| literals.rb:132:15:132:15 | 1 | IntegerLiteral | 1 |
-| literals.rb:133:13:133:13 | 5 | IntegerLiteral | 5 |
-| literals.rb:133:17:133:17 | 4 | IntegerLiteral | 4 |
-| literals.rb:140:8:140:8 | 1 | IntegerLiteral | 1 |
-| literals.rb:140:12:140:12 | 1 | IntegerLiteral | 1 |
-| literals.rb:146:10:146:10 | 1 | IntegerLiteral | 1 |
-| literals.rb:146:14:146:14 | 1 | IntegerLiteral | 1 |
-| literals.rb:184:5:184:6 | 42 | IntegerLiteral | 42 |
-| literals.rb:185:8:185:8 | 5 | IntegerLiteral | 5 |
+| literals.rb:14:1:14:10 | 2147483647 | IntegerLiteral | 2147483647 |
+| literals.rb:15:1:15:10 | 2147483648 | IntegerLiteral | <none> |
+| literals.rb:18:1:18:6 | 0x1234 | IntegerLiteral | 4660 |
+| literals.rb:19:1:19:6 | 0xbeef | IntegerLiteral | 48879 |
+| literals.rb:20:1:20:7 | 0xF0_0D | IntegerLiteral | 61453 |
+| literals.rb:21:1:21:22 | 0x000000000000000000ff | IntegerLiteral | 255 |
+| literals.rb:22:1:22:11 | 0x7FFF_FFFF | IntegerLiteral | 2147483647 |
+| literals.rb:23:1:23:10 | 0x80000000 | IntegerLiteral | <none> |
+| literals.rb:24:1:24:10 | 0xdeadbeef | IntegerLiteral | <none> |
+| literals.rb:25:1:25:11 | 0xF00D_face | IntegerLiteral | <none> |
+| literals.rb:28:1:28:4 | 0123 | IntegerLiteral | 83 |
+| literals.rb:29:1:29:5 | 0o234 | IntegerLiteral | 156 |
+| literals.rb:30:1:30:6 | 0O45_6 | IntegerLiteral | 302 |
+| literals.rb:31:1:31:31 | 0000000000000000000000000000010 | IntegerLiteral | 8 |
+| literals.rb:32:1:32:12 | 017777777777 | IntegerLiteral | 2147483647 |
+| literals.rb:33:1:33:12 | 020000000000 | IntegerLiteral | <none> |
+| literals.rb:36:1:36:10 | 0b10010100 | IntegerLiteral | 148 |
+| literals.rb:37:1:37:11 | 0B011_01101 | IntegerLiteral | 109 |
+| literals.rb:38:1:38:43 | 0b00000000000000000000000000000000000000011 | IntegerLiteral | 3 |
+| literals.rb:39:1:39:34 | 0b01111111111111111111111111111111 | IntegerLiteral | 2147483647 |
+| literals.rb:40:1:40:34 | 0b10000000000000000000000000000000 | IntegerLiteral | <none> |
+| literals.rb:71:13:71:13 | 2 | IntegerLiteral | 2 |
+| literals.rb:71:17:71:17 | 2 | IntegerLiteral | 2 |
+| literals.rb:72:15:72:15 | 3 | IntegerLiteral | 3 |
+| literals.rb:72:19:72:19 | 4 | IntegerLiteral | 4 |
+| literals.rb:77:14:77:14 | 1 | IntegerLiteral | 1 |
+| literals.rb:77:18:77:18 | 1 | IntegerLiteral | 1 |
+| literals.rb:78:17:78:17 | 2 | IntegerLiteral | 2 |
+| literals.rb:78:21:78:21 | 3 | IntegerLiteral | 3 |
+| literals.rb:79:17:79:17 | 1 | IntegerLiteral | 1 |
+| literals.rb:79:19:79:19 | 9 | IntegerLiteral | 9 |
+| literals.rb:104:10:104:10 | 2 | IntegerLiteral | 2 |
+| literals.rb:104:14:104:14 | 2 | IntegerLiteral | 2 |
+| literals.rb:110:2:110:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:110:5:110:5 | 2 | IntegerLiteral | 2 |
+| literals.rb:110:8:110:8 | 3 | IntegerLiteral | 3 |
+| literals.rb:111:2:111:2 | 4 | IntegerLiteral | 4 |
+| literals.rb:111:5:111:5 | 5 | IntegerLiteral | 5 |
+| literals.rb:111:8:111:9 | 12 | IntegerLiteral | 12 |
+| literals.rb:111:13:111:13 | 2 | IntegerLiteral | 2 |
+| literals.rb:112:2:112:2 | 7 | IntegerLiteral | 7 |
+| literals.rb:112:6:112:6 | 8 | IntegerLiteral | 8 |
+| literals.rb:112:9:112:9 | 9 | IntegerLiteral | 9 |
+| literals.rb:118:13:118:13 | 1 | IntegerLiteral | 1 |
+| literals.rb:118:15:118:15 | 1 | IntegerLiteral | 1 |
+| literals.rb:125:14:125:14 | 2 | IntegerLiteral | 2 |
+| literals.rb:125:18:125:18 | 4 | IntegerLiteral | 4 |
+| literals.rb:130:8:130:8 | 1 | IntegerLiteral | 1 |
+| literals.rb:130:19:130:19 | 2 | IntegerLiteral | 2 |
+| literals.rb:130:31:130:31 | 3 | IntegerLiteral | 3 |
+| literals.rb:131:8:131:8 | 7 | IntegerLiteral | 7 |
+| literals.rb:134:2:134:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:134:5:134:6 | 10 | IntegerLiteral | 10 |
+| literals.rb:135:2:135:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:135:6:135:7 | 10 | IntegerLiteral | 10 |
+| literals.rb:136:2:136:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:136:7:136:7 | 0 | IntegerLiteral | 0 |
+| literals.rb:137:9:137:9 | 2 | IntegerLiteral | 2 |
+| literals.rb:137:11:137:11 | 3 | IntegerLiteral | 3 |
+| literals.rb:138:2:138:2 | 1 | IntegerLiteral | 1 |
+| literals.rb:139:4:139:4 | 1 | IntegerLiteral | 1 |
+| literals.rb:140:2:140:2 | 0 | IntegerLiteral | 0 |
+| literals.rb:140:6:140:6 | 1 | IntegerLiteral | 1 |
+| literals.rb:145:11:145:11 | 1 | IntegerLiteral | 1 |
+| literals.rb:145:15:145:15 | 1 | IntegerLiteral | 1 |
+| literals.rb:146:13:146:13 | 5 | IntegerLiteral | 5 |
+| literals.rb:146:17:146:17 | 4 | IntegerLiteral | 4 |
+| literals.rb:153:8:153:8 | 1 | IntegerLiteral | 1 |
+| literals.rb:153:12:153:12 | 1 | IntegerLiteral | 1 |
+| literals.rb:159:10:159:10 | 1 | IntegerLiteral | 1 |
+| literals.rb:159:14:159:14 | 1 | IntegerLiteral | 1 |
+| literals.rb:197:5:197:6 | 42 | IntegerLiteral | 42 |
+| literals.rb:198:8:198:8 | 5 | IntegerLiteral | 5 |
 floatLiterals
-| literals.rb:30:1:30:5 | 12.34 | FloatLiteral | 12.34 |
-| literals.rb:31:1:31:7 | 1234e-2 | FloatLiteral | 12.34 |
-| literals.rb:32:1:32:7 | 1.234E1 | FloatLiteral | 12.34 |
+| literals.rb:43:1:43:5 | 12.34 | FloatLiteral | 12.34 |
+| literals.rb:44:1:44:7 | 1234e-2 | FloatLiteral | 12.34 |
+| literals.rb:45:1:45:7 | 1.234E1 | FloatLiteral | 12.34 |
 rationalLiterals
-| literals.rb:35:1:35:3 | 23r | RationalLiteral | 23/1 |
-| literals.rb:36:1:36:5 | 9.85r | RationalLiteral | 985/100 |
+| literals.rb:48:1:48:3 | 23r | RationalLiteral | 23/1 |
+| literals.rb:49:1:49:5 | 9.85r | RationalLiteral | 985/100 |
 complexLiterals
-| literals.rb:39:1:39:2 | 2i | ComplexLiteral | 0+2i |
+| literals.rb:52:1:52:2 | 2i | ComplexLiteral | 0+2i |
diff --git a/ruby/ql/test/library-tests/ast/literals/literals.rb b/ruby/ql/test/library-tests/ast/literals/literals.rb
index 7485e34c53d..10c28de265f 100644
--- a/ruby/ql/test/library-tests/ast/literals/literals.rb
+++ b/ruby/ql/test/library-tests/ast/literals/literals.rb
@@ -11,20 +11,33 @@ TRUE
 5_678
 0
 0d900
+2147483647 # max value representable by QL's int type
+2147483648 # too large to be representable by an int
 
 # hexadecimal integers
 0x1234
-0xdeadbeef
-0xF00D_face
+0xbeef
+0xF0_0D
+0x000000000000000000ff
+0x7FFF_FFFF # max value representable by QL's int type
+0x80000000  # too large to be represented by an int
+0xdeadbeef  # too large to be represented by an int
+0xF00D_face # too large to be represented by an int
 
 # octal integers
 0123
 0o234
 0O45_6
+0000000000000000000000000000010
+017777777777 # max value representable by QL's int type
+020000000000 # too large to be represented by an int
 
 # binary integers
 0b10010100
 0B011_01101
+0b00000000000000000000000000000000000000011
+0b01111111111111111111111111111111 # max value representable by QL's int type
+0b10000000000000000000000000000000 # too large to be represented by an int
 
 # floating-point numbers
 12.34
diff --git a/ruby/ql/test/library-tests/ast/misc/misc.expected b/ruby/ql/test/library-tests/ast/misc/misc.expected
index befd5734091..fb6681bcab9 100644
--- a/ruby/ql/test/library-tests/ast/misc/misc.expected
+++ b/ruby/ql/test/library-tests/ast/misc/misc.expected
@@ -17,5 +17,5 @@ alias
 | misc.rb:8:1:8:14 | alias ... | old | misc.rb:8:12:8:14 | []= | []= | MethodName |
 | misc.rb:9:1:9:16 | alias ... | new | misc.rb:9:7:9:11 | super | super | MethodName |
 | misc.rb:9:1:9:16 | alias ... | old | misc.rb:9:13:9:16 | self | self | MethodName |
-| misc.rb:10:1:10:24 | alias ... | new | misc.rb:10:7:10:17 | :"\\n#{...}" | \\nbar | MethodName |
+| misc.rb:10:1:10:24 | alias ... | new | misc.rb:10:7:10:17 | :"\\n#{...}" | \nbar | MethodName |
 | misc.rb:10:1:10:24 | alias ... | old | misc.rb:10:19:10:24 | :"foo" | foo | MethodName |
diff --git a/ruby/ql/test/library-tests/concepts/PersistentWriteAccess.expected b/ruby/ql/test/library-tests/concepts/PersistentWriteAccess.expected
new file mode 100644
index 00000000000..5bfa8b41a01
--- /dev/null
+++ b/ruby/ql/test/library-tests/concepts/PersistentWriteAccess.expected
@@ -0,0 +1,22 @@
+| app/controllers/users_controller.rb:5:7:5:44 | call to create! | app/controllers/users_controller.rb:5:26:5:29 | "U1" |
+| app/controllers/users_controller.rb:5:7:5:44 | call to create! | app/controllers/users_controller.rb:5:37:5:43 | call to get_uid |
+| app/controllers/users_controller.rb:6:7:6:29 | call to create | app/controllers/users_controller.rb:6:25:6:28 | "U2" |
+| app/controllers/users_controller.rb:7:7:7:31 | call to insert | app/controllers/users_controller.rb:7:26:7:29 | "U3" |
+| app/controllers/users_controller.rb:10:7:10:32 | call to update | app/controllers/users_controller.rb:10:28:10:31 | "U4" |
+| app/controllers/users_controller.rb:11:7:11:73 | call to update! | app/controllers/users_controller.rb:11:39:11:42 | "U5" |
+| app/controllers/users_controller.rb:11:7:11:73 | call to update! | app/controllers/users_controller.rb:11:53:11:56 | "U6" |
+| app/controllers/users_controller.rb:11:7:11:73 | call to update! | app/controllers/users_controller.rb:11:67:11:70 | "U7" |
+| app/controllers/users_controller.rb:14:7:14:66 | call to insert_all | app/controllers/users_controller.rb:14:31:14:34 | "U8" |
+| app/controllers/users_controller.rb:14:7:14:66 | call to insert_all | app/controllers/users_controller.rb:14:45:14:48 | "U9" |
+| app/controllers/users_controller.rb:14:7:14:66 | call to insert_all | app/controllers/users_controller.rb:14:59:14:63 | "U10" |
+| app/controllers/users_controller.rb:19:7:19:30 | call to update | app/controllers/users_controller.rb:19:25:19:29 | "U11" |
+| app/controllers/users_controller.rb:20:7:20:57 | call to update_attributes | app/controllers/users_controller.rb:20:37:20:41 | "U12" |
+| app/controllers/users_controller.rb:20:7:20:57 | call to update_attributes | app/controllers/users_controller.rb:20:49:20:55 | call to get_uid |
+| app/controllers/users_controller.rb:23:7:23:42 | call to update_attribute | app/controllers/users_controller.rb:23:37:23:41 | "U13" |
+| app/controllers/users_controller.rb:26:7:26:15 | ... = ... | app/controllers/users_controller.rb:26:19:26:23 | "U14" |
+| app/models/user.rb:4:5:4:28 | call to update | app/models/user.rb:4:23:4:27 | "U15" |
+| app/models/user.rb:5:5:5:23 | call to update | app/models/user.rb:5:18:5:22 | "U16" |
+| app/models/user.rb:6:5:6:56 | call to update_attributes | app/models/user.rb:6:35:6:39 | "U17" |
+| app/models/user.rb:6:5:6:56 | call to update_attributes | app/models/user.rb:6:51:6:54 | true |
+| app/models/user.rb:9:5:9:40 | call to update_attribute | app/models/user.rb:9:35:9:39 | "U18" |
+| app/models/user.rb:12:5:12:13 | ... = ... | app/models/user.rb:12:17:12:21 | "U19" |
diff --git a/ruby/ql/test/library-tests/concepts/PersistentWriteAccess.ql b/ruby/ql/test/library-tests/concepts/PersistentWriteAccess.ql
new file mode 100644
index 00000000000..6f81216db91
--- /dev/null
+++ b/ruby/ql/test/library-tests/concepts/PersistentWriteAccess.ql
@@ -0,0 +1,6 @@
+import codeql.ruby.DataFlow
+import codeql.ruby.Concepts
+
+query predicate persistentWriteAccesses(PersistentWriteAccess acc, DataFlow::Node value) {
+  value = acc.getValue()
+}
diff --git a/ruby/ql/test/library-tests/concepts/app/controllers/users_controller.rb b/ruby/ql/test/library-tests/concepts/app/controllers/users_controller.rb
new file mode 100644
index 00000000000..b6f23d5ff43
--- /dev/null
+++ b/ruby/ql/test/library-tests/concepts/app/controllers/users_controller.rb
@@ -0,0 +1,34 @@
+module Users
+  class UsersController < ApplicationController
+    def create_or_modify
+      # CreateLikeCall
+      User.create!(name: "U1", uid: get_uid)
+      User.create(name: "U2")
+      User.insert({name: "U3"})
+
+      # UpdateLikeClassMethodCall
+      User.update(4, name: "U4")
+      User.update!([5, 6, 7], [{name: "U5"}, {name: "U6"}, {name: "U7"}])
+
+      # InsertAllLikeCall
+      User.insert_all([{name: "U8"}, {name: "U9"}, {name: "U10"}])
+
+      user = User.find(5)
+
+      # UpdateLikeInstanceMethodCall
+      user.update(name: "U11")
+      user.update_attributes({name: "U12", uid: get_uid})
+
+      # UpdateAttributeCall
+      user.update_attribute("name", "U13")
+
+      # AssignAttributeCall
+      user.name = "U14"
+      user.save
+    end
+
+    def get_uid
+      User.last.id + 1
+    end
+  end
+end
diff --git a/ruby/ql/test/library-tests/concepts/app/models/application_record.rb b/ruby/ql/test/library-tests/concepts/app/models/application_record.rb
new file mode 100644
index 00000000000..10a4cba84df
--- /dev/null
+++ b/ruby/ql/test/library-tests/concepts/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/ruby/ql/test/library-tests/concepts/app/models/user.rb b/ruby/ql/test/library-tests/concepts/app/models/user.rb
new file mode 100644
index 00000000000..0704be7c97c
--- /dev/null
+++ b/ruby/ql/test/library-tests/concepts/app/models/user.rb
@@ -0,0 +1,15 @@
+class User < ActiveRecord::Base
+  def t1
+    # UpdateLikeInstanceMethodCall
+    self.update(name: "U15")
+    update(name: "U16")
+    self.update_attributes({name: "U17", isAdmin: true})
+
+    # UpdateAttributeCall
+    self.update_attribute("name", "U18")
+
+    # AssignAttributeCall
+    self.name = "U19"
+    user.save
+  end
+end
diff --git a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
index c63bdc5579d..26356f8b63f 100644
--- a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
@@ -1,6 +1,6 @@
 | local_dataflow.rb:1:1:7:3 | self (foo) | local_dataflow.rb:3:8:3:10 | self |
 | local_dataflow.rb:1:1:7:3 | self (local_dataflow.rb) | local_dataflow.rb:49:1:53:3 | self |
-| local_dataflow.rb:1:1:7:3 | self in foo | local_dataflow.rb:3:8:3:10 | self |
+| local_dataflow.rb:1:1:7:3 | self in foo | local_dataflow.rb:1:1:7:3 | self (foo) |
 | local_dataflow.rb:1:9:1:9 | a | local_dataflow.rb:1:9:1:9 | a |
 | local_dataflow.rb:1:9:1:9 | a | local_dataflow.rb:2:7:2:7 | a |
 | local_dataflow.rb:2:3:2:7 | ... = ... | local_dataflow.rb:3:13:3:13 | b |
@@ -71,16 +71,7 @@
 | local_dataflow.rb:50:18:50:18 | x | local_dataflow.rb:51:20:51:20 | x |
 | local_dataflow.rb:51:9:51:15 | "break" | local_dataflow.rb:51:3:51:15 | break |
 | local_dataflow.rb:60:1:90:3 | self (test_case) | local_dataflow.rb:78:12:78:20 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:78:12:78:20 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:79:20:79:26 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:80:24:80:30 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:82:7:82:13 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:83:7:83:13 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:84:7:84:13 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:85:22:85:28 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:86:28:86:34 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:87:20:87:26 | self |
-| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:60:1:90:3 | self (test_case) |
 | local_dataflow.rb:60:15:60:15 | x | local_dataflow.rb:60:15:60:15 | x |
 | local_dataflow.rb:60:15:60:15 | x | local_dataflow.rb:61:12:61:12 | x |
 | local_dataflow.rb:61:7:68:5 | case ... | local_dataflow.rb:61:3:68:5 | ... = ... |
diff --git a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.expected b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.expected
index eb4ee2a6c3f..46b0b0392f8 100644
--- a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.expected
+++ b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.expected
@@ -201,7 +201,6 @@ edges
 | string_flow.rb:241:10:241:10 | b [array element] :  | string_flow.rb:241:10:241:13 | ...[...] |
 | string_flow.rb:242:10:242:10 | b [array element] :  | string_flow.rb:242:10:242:13 | ...[...] |
 | string_flow.rb:246:5:246:18 | ... = ... :  | string_flow.rb:250:26:250:26 | a :  |
-| string_flow.rb:246:5:246:18 | ... = ... :  | string_flow.rb:258:27:258:27 | a :  |
 | string_flow.rb:246:9:246:18 | call to source :  | string_flow.rb:246:5:246:18 | ... = ... :  |
 | string_flow.rb:246:9:246:18 | call to source :  | string_flow.rb:247:10:247:10 | a :  |
 | string_flow.rb:246:9:246:18 | call to source :  | string_flow.rb:248:20:248:20 | a :  |
@@ -215,7 +214,6 @@ edges
 | string_flow.rb:250:26:250:26 | a :  | string_flow.rb:250:10:250:28 | call to scrub |
 | string_flow.rb:252:10:252:10 | a :  | string_flow.rb:252:10:252:22 | call to scrub! |
 | string_flow.rb:253:21:253:21 | a :  | string_flow.rb:253:10:253:22 | call to scrub! |
-| string_flow.rb:255:5:255:18 | ... = ... :  | string_flow.rb:250:26:250:26 | a :  |
 | string_flow.rb:255:5:255:18 | ... = ... :  | string_flow.rb:258:27:258:27 | a :  |
 | string_flow.rb:255:9:255:18 | call to source :  | string_flow.rb:255:5:255:18 | ... = ... :  |
 | string_flow.rb:255:9:255:18 | call to source :  | string_flow.rb:256:5:256:5 | a :  |
diff --git a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected
index 4640f713f07..0d8f16864db 100644
--- a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected
+++ b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.expected
@@ -5,6 +5,7 @@ track
 | type_tracker.rb:2:5:5:7 | return return in field= | type tracker without call steps | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:2:5:5:7 | self (field=) | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:2:5:5:7 | self (field=) | type tracker without call steps | type_tracker.rb:2:5:5:7 | self (field=) |
+| type_tracker.rb:2:5:5:7 | self in field= | type tracker with call steps | type_tracker.rb:2:5:5:7 | self (field=) |
 | type_tracker.rb:2:5:5:7 | self in field= | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:2:5:5:7 | self in field= | type tracker without call steps | type_tracker.rb:2:5:5:7 | self in field= |
 | type_tracker.rb:2:16:2:18 | val | type tracker with call steps | type_tracker.rb:2:16:2:18 | val |
@@ -16,17 +17,10 @@ track
 | type_tracker.rb:3:9:3:23 | [post] self | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:3:9:3:23 | [post] self | type tracker without call steps | type_tracker.rb:3:9:3:23 | [post] self |
 | type_tracker.rb:3:9:3:23 | call to puts | type tracker without call steps | type_tracker.rb:3:9:3:23 | call to puts |
-| type_tracker.rb:3:9:3:23 | self | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
-| type_tracker.rb:3:9:3:23 | self | type tracker without call steps | type_tracker.rb:3:9:3:23 | self |
 | type_tracker.rb:3:14:3:17 | [post] self | type tracker without call steps | type_tracker.rb:3:14:3:17 | [post] self |
-| type_tracker.rb:3:14:3:17 | self | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
-| type_tracker.rb:3:14:3:17 | self | type tracker without call steps | type_tracker.rb:3:14:3:17 | self |
 | type_tracker.rb:3:14:3:23 | [post] call to field | type tracker without call steps | type_tracker.rb:3:14:3:23 | [post] call to field |
 | type_tracker.rb:3:14:3:23 | call to field | type tracker without call steps | type_tracker.rb:3:14:3:23 | call to field |
 | type_tracker.rb:4:9:4:14 | @field | type tracker without call steps | type_tracker.rb:4:9:4:14 | @field |
-| type_tracker.rb:4:18:4:20 | val | type tracker without call steps | type_tracker.rb:2:5:5:7 | return return in field= |
-| type_tracker.rb:4:18:4:20 | val | type tracker without call steps | type_tracker.rb:4:18:4:20 | val |
-| type_tracker.rb:4:18:4:20 | val | type tracker without call steps | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:7:5:9:7 | &block | type tracker without call steps | type_tracker.rb:7:5:9:7 | &block |
 | type_tracker.rb:7:5:9:7 | field | type tracker without call steps | type_tracker.rb:7:5:9:7 | field |
 | type_tracker.rb:7:5:9:7 | return return in field | type tracker without call steps | type_tracker.rb:3:14:3:23 | call to field |
@@ -41,28 +35,35 @@ track
 | type_tracker.rb:12:1:16:3 | m | type tracker without call steps | type_tracker.rb:12:1:16:3 | m |
 | type_tracker.rb:12:1:16:3 | return return in m | type tracker without call steps | type_tracker.rb:12:1:16:3 | return return in m |
 | type_tracker.rb:12:1:16:3 | self (m) | type tracker without call steps | type_tracker.rb:12:1:16:3 | self (m) |
+| type_tracker.rb:12:1:16:3 | self in m | type tracker with call steps | type_tracker.rb:12:1:16:3 | self (m) |
 | type_tracker.rb:12:1:16:3 | self in m | type tracker without call steps | type_tracker.rb:12:1:16:3 | self in m |
 | type_tracker.rb:13:5:13:7 | var | type tracker without call steps | type_tracker.rb:13:5:13:7 | var |
+| type_tracker.rb:13:5:13:23 | ... = ... | type tracker with call steps | type_tracker.rb:2:5:5:7 | self (field=) |
+| type_tracker.rb:13:5:13:23 | ... = ... | type tracker with call steps | type_tracker.rb:2:5:5:7 | self in field= |
+| type_tracker.rb:13:5:13:23 | ... = ... | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
+| type_tracker.rb:13:5:13:23 | ... = ... | type tracker without call steps | type_tracker.rb:13:5:13:23 | ... = ... |
 | type_tracker.rb:13:11:13:19 | Container | type tracker without call steps | type_tracker.rb:13:11:13:19 | Container |
 | type_tracker.rb:13:11:13:19 | [post] Container | type tracker without call steps | type_tracker.rb:13:11:13:19 | [post] Container |
+| type_tracker.rb:13:11:13:23 | call to new | type tracker with call steps | type_tracker.rb:2:5:5:7 | self (field=) |
 | type_tracker.rb:13:11:13:23 | call to new | type tracker with call steps | type_tracker.rb:2:5:5:7 | self in field= |
 | type_tracker.rb:13:11:13:23 | call to new | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:13:11:13:23 | call to new | type tracker without call steps | type_tracker.rb:13:11:13:23 | call to new |
 | type_tracker.rb:14:5:14:7 | [post] var | type tracker with call steps | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:14:5:14:7 | [post] var | type tracker without call steps | type_tracker.rb:14:5:14:7 | [post] var |
+| type_tracker.rb:14:5:14:13 | ... = ... | type tracker without call steps | type_tracker.rb:14:5:14:13 | ... = ... |
 | type_tracker.rb:14:5:14:13 | [post] ... = ... | type tracker without call steps | type_tracker.rb:14:5:14:13 | [post] ... = ... |
 | type_tracker.rb:14:5:14:13 | __synth__0 | type tracker without call steps | type_tracker.rb:14:5:14:13 | __synth__0 |
 | type_tracker.rb:14:5:14:13 | call to field= | type tracker without call steps | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:14:17:14:23 | "hello" | type tracker with call steps | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:14:17:14:23 | "hello" | type tracker with call steps | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:14:17:14:23 | "hello" | type tracker with call steps with content field | type_tracker.rb:7:5:9:7 | self in field |
+| type_tracker.rb:14:17:14:23 | "hello" | type tracker without call steps | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:14:17:14:23 | "hello" | type tracker without call steps | type_tracker.rb:14:17:14:23 | "hello" |
 | type_tracker.rb:14:17:14:23 | "hello" | type tracker without call steps | type_tracker.rb:15:10:15:18 | call to field |
 | type_tracker.rb:14:17:14:23 | "hello" | type tracker without call steps with content field | type_tracker.rb:14:5:14:7 | [post] var |
 | type_tracker.rb:15:5:15:18 | [post] self | type tracker without call steps | type_tracker.rb:15:5:15:18 | [post] self |
 | type_tracker.rb:15:5:15:18 | call to puts | type tracker without call steps | type_tracker.rb:12:1:16:3 | return return in m |
 | type_tracker.rb:15:5:15:18 | call to puts | type tracker without call steps | type_tracker.rb:15:5:15:18 | call to puts |
-| type_tracker.rb:15:5:15:18 | self | type tracker without call steps | type_tracker.rb:15:5:15:18 | self |
 | type_tracker.rb:15:10:15:12 | [post] var | type tracker without call steps | type_tracker.rb:15:10:15:12 | [post] var |
 | type_tracker.rb:15:10:15:18 | [post] call to field | type tracker without call steps | type_tracker.rb:15:10:15:18 | [post] call to field |
 | type_tracker.rb:15:10:15:18 | call to field | type tracker without call steps | type_tracker.rb:15:10:15:18 | call to field |
@@ -72,30 +73,34 @@ trackEnd
 | type_tracker.rb:2:5:5:7 | return return in field= | type_tracker.rb:2:5:5:7 | return return in field= |
 | type_tracker.rb:2:5:5:7 | return return in field= | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:2:5:5:7 | self (field=) | type_tracker.rb:2:5:5:7 | self (field=) |
+| type_tracker.rb:2:5:5:7 | self (field=) | type_tracker.rb:3:9:3:23 | self |
+| type_tracker.rb:2:5:5:7 | self (field=) | type_tracker.rb:3:14:3:17 | self |
 | type_tracker.rb:2:5:5:7 | self (field=) | type_tracker.rb:7:5:9:7 | self in field |
+| type_tracker.rb:2:5:5:7 | self in field= | type_tracker.rb:2:5:5:7 | self (field=) |
 | type_tracker.rb:2:5:5:7 | self in field= | type_tracker.rb:2:5:5:7 | self in field= |
+| type_tracker.rb:2:5:5:7 | self in field= | type_tracker.rb:3:9:3:23 | self |
+| type_tracker.rb:2:5:5:7 | self in field= | type_tracker.rb:3:14:3:17 | self |
 | type_tracker.rb:2:5:5:7 | self in field= | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:5:5:7 | return return in field= |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:2:16:2:18 | val |
+| type_tracker.rb:2:16:2:18 | val | type_tracker.rb:4:9:4:20 | ... = ... |
+| type_tracker.rb:2:16:2:18 | val | type_tracker.rb:4:9:4:20 | ... = ... |
+| type_tracker.rb:2:16:2:18 | val | type_tracker.rb:4:18:4:20 | val |
+| type_tracker.rb:2:16:2:18 | val | type_tracker.rb:4:18:4:20 | val |
 | type_tracker.rb:2:16:2:18 | val | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:3:9:3:23 | [post] self | type_tracker.rb:3:9:3:23 | [post] self |
+| type_tracker.rb:3:9:3:23 | [post] self | type_tracker.rb:3:14:3:17 | self |
 | type_tracker.rb:3:9:3:23 | [post] self | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:3:9:3:23 | call to puts | type_tracker.rb:3:9:3:23 | call to puts |
-| type_tracker.rb:3:9:3:23 | self | type_tracker.rb:3:9:3:23 | self |
-| type_tracker.rb:3:9:3:23 | self | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:3:14:3:17 | [post] self | type_tracker.rb:3:14:3:17 | [post] self |
-| type_tracker.rb:3:14:3:17 | self | type_tracker.rb:3:14:3:17 | self |
-| type_tracker.rb:3:14:3:17 | self | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:3:14:3:23 | [post] call to field | type_tracker.rb:3:14:3:23 | [post] call to field |
 | type_tracker.rb:3:14:3:23 | call to field | type_tracker.rb:3:14:3:23 | call to field |
 | type_tracker.rb:4:9:4:14 | @field | type_tracker.rb:4:9:4:14 | @field |
-| type_tracker.rb:4:18:4:20 | val | type_tracker.rb:2:5:5:7 | return return in field= |
-| type_tracker.rb:4:18:4:20 | val | type_tracker.rb:4:18:4:20 | val |
-| type_tracker.rb:4:18:4:20 | val | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:7:5:9:7 | &block | type_tracker.rb:7:5:9:7 | &block |
+| type_tracker.rb:7:5:9:7 | field | type_tracker.rb:1:1:10:3 | Container |
 | type_tracker.rb:7:5:9:7 | field | type_tracker.rb:7:5:9:7 | field |
 | type_tracker.rb:7:5:9:7 | return return in field | type_tracker.rb:3:14:3:23 | call to field |
 | type_tracker.rb:7:5:9:7 | return return in field | type_tracker.rb:7:5:9:7 | return return in field |
@@ -109,26 +114,54 @@ trackEnd
 | type_tracker.rb:12:1:16:3 | m | type_tracker.rb:12:1:16:3 | m |
 | type_tracker.rb:12:1:16:3 | return return in m | type_tracker.rb:12:1:16:3 | return return in m |
 | type_tracker.rb:12:1:16:3 | self (m) | type_tracker.rb:12:1:16:3 | self (m) |
+| type_tracker.rb:12:1:16:3 | self (m) | type_tracker.rb:15:5:15:18 | self |
+| type_tracker.rb:12:1:16:3 | self in m | type_tracker.rb:12:1:16:3 | self (m) |
 | type_tracker.rb:12:1:16:3 | self in m | type_tracker.rb:12:1:16:3 | self in m |
+| type_tracker.rb:12:1:16:3 | self in m | type_tracker.rb:15:5:15:18 | self |
 | type_tracker.rb:13:5:13:7 | var | type_tracker.rb:13:5:13:7 | var |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:2:5:5:7 | self (field=) |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:2:5:5:7 | self in field= |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:3:9:3:23 | self |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:3:14:3:17 | self |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:7:5:9:7 | self in field |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:13:5:13:23 | ... = ... |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:14:5:14:7 | var |
+| type_tracker.rb:13:5:13:23 | ... = ... | type_tracker.rb:15:10:15:12 | var |
 | type_tracker.rb:13:11:13:19 | Container | type_tracker.rb:13:11:13:19 | Container |
 | type_tracker.rb:13:11:13:19 | [post] Container | type_tracker.rb:13:11:13:19 | [post] Container |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:2:5:5:7 | self (field=) |
 | type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:2:5:5:7 | self in field= |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:3:9:3:23 | self |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:3:14:3:17 | self |
 | type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:7:5:9:7 | self in field |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:13:5:13:23 | ... = ... |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:13:5:13:23 | ... = ... |
 | type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:13:11:13:23 | call to new |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:14:5:14:7 | var |
+| type_tracker.rb:13:11:13:23 | call to new | type_tracker.rb:15:10:15:12 | var |
 | type_tracker.rb:14:5:14:7 | [post] var | type_tracker.rb:7:5:9:7 | self in field |
 | type_tracker.rb:14:5:14:7 | [post] var | type_tracker.rb:14:5:14:7 | [post] var |
+| type_tracker.rb:14:5:14:7 | [post] var | type_tracker.rb:15:10:15:12 | var |
+| type_tracker.rb:14:5:14:13 | ... = ... | type_tracker.rb:14:5:14:13 | ... = ... |
+| type_tracker.rb:14:5:14:13 | ... = ... | type_tracker.rb:14:5:14:13 | __synth__0 |
+| type_tracker.rb:14:5:14:13 | ... = ... | type_tracker.rb:14:5:14:23 | ... |
 | type_tracker.rb:14:5:14:13 | [post] ... = ... | type_tracker.rb:14:5:14:13 | [post] ... = ... |
 | type_tracker.rb:14:5:14:13 | __synth__0 | type_tracker.rb:14:5:14:13 | __synth__0 |
 | type_tracker.rb:14:5:14:13 | call to field= | type_tracker.rb:14:5:14:13 | call to field= |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:2:16:2:18 | val |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:2:16:2:18 | val |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:4:9:4:20 | ... = ... |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:4:18:4:20 | val |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:13 | ... = ... |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:13 | ... = ... |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:13 | __synth__0 |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:13 | call to field= |
+| type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:5:14:23 | ... |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:14:17:14:23 | "hello" |
 | type_tracker.rb:14:17:14:23 | "hello" | type_tracker.rb:15:10:15:18 | call to field |
 | type_tracker.rb:15:5:15:18 | [post] self | type_tracker.rb:15:5:15:18 | [post] self |
 | type_tracker.rb:15:5:15:18 | call to puts | type_tracker.rb:12:1:16:3 | return return in m |
 | type_tracker.rb:15:5:15:18 | call to puts | type_tracker.rb:15:5:15:18 | call to puts |
-| type_tracker.rb:15:5:15:18 | self | type_tracker.rb:15:5:15:18 | self |
 | type_tracker.rb:15:10:15:12 | [post] var | type_tracker.rb:15:10:15:12 | [post] var |
 | type_tracker.rb:15:10:15:18 | [post] call to field | type_tracker.rb:15:10:15:18 | [post] call to field |
 | type_tracker.rb:15:10:15:18 | call to field | type_tracker.rb:15:10:15:18 | call to field |
diff --git a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql
index acd3c516009..1d568a8e3a1 100644
--- a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql
+++ b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql
@@ -13,6 +13,9 @@ query predicate track(LocalSourceNode src, TypeTracker t, LocalSourceNode dst) {
   exists(TypeTracker t2, LocalSourceNode mid | track(src, t2, mid) and dst = mid.track(t2, t))
 }
 
-query predicate trackEnd(LocalSourceNode src, LocalSourceNode dst) {
-  track(src, TypeTracker::end(), dst)
+query predicate trackEnd(LocalSourceNode src, DataFlow::Node dst) {
+  exists(LocalSourceNode end |
+    track(src, TypeTracker::end(), end) and
+    end.flowsTo(dst)
+  )
 }
diff --git a/ruby/ql/test/library-tests/frameworks/ActiveRecord.expected b/ruby/ql/test/library-tests/frameworks/ActiveRecord.expected
index 183e45ea45e..a18e9fa1167 100644
--- a/ruby/ql/test/library-tests/frameworks/ActiveRecord.expected
+++ b/ruby/ql/test/library-tests/frameworks/ActiveRecord.expected
@@ -45,9 +45,9 @@ potentiallyUnsafeSqlExecutingMethodCall
 | ActiveRecordInjection.rb:75:5:75:29 | call to order |
 | ActiveRecordInjection.rb:80:7:80:40 | call to find_by |
 activeRecordModelInstantiations
-| ActiveRecordInjection.rb:10:5:10:68 | self | ActiveRecordInjection.rb:5:1:17:3 | User |
+| ActiveRecordInjection.rb:8:3:11:5 | self (authenticate) | ActiveRecordInjection.rb:5:1:17:3 | User |
 | ActiveRecordInjection.rb:15:5:15:40 | call to find_by | ActiveRecordInjection.rb:1:1:3:3 | UserGroup |
-| ActiveRecordInjection.rb:23:5:23:25 | self | ActiveRecordInjection.rb:19:1:25:3 | Admin |
+| ActiveRecordInjection.rb:20:3:24:5 | self (delete_by) | ActiveRecordInjection.rb:19:1:25:3 | Admin |
 | ActiveRecordInjection.rb:80:7:80:40 | call to find_by | ActiveRecordInjection.rb:5:1:17:3 | User |
 | ActiveRecordInjection.rb:85:5:85:33 | call to find_by | ActiveRecordInjection.rb:5:1:17:3 | User |
 | ActiveRecordInjection.rb:88:5:88:34 | call to find | ActiveRecordInjection.rb:5:1:17:3 | User |
diff --git a/ruby/ql/test/library-tests/regexp/parse.expected b/ruby/ql/test/library-tests/regexp/parse.expected
index 3241ce25388..9256fefd67a 100644
--- a/ruby/ql/test/library-tests/regexp/parse.expected
+++ b/ruby/ql/test/library-tests/regexp/parse.expected
@@ -29,29 +29,21 @@ regexp.rb:
 #    9| [RegExpRange] a{4,8}
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 
-#    9| [RegExpNormalChar] 4,8}
-
 #   10| [RegExpConstant, RegExpNormalChar] a
 
 #   10| [RegExpRange] a{,8}
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 
-#   10| [RegExpNormalChar] ,8}
-
 #   11| [RegExpConstant, RegExpNormalChar] a
 
 #   11| [InfiniteRepetitionQuantifier, RegExpRange] a{3,}
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 
-#   11| [RegExpNormalChar] 3,}
-
 #   12| [RegExpConstant, RegExpNormalChar] a
 
 #   12| [RegExpRange] a{7}
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 
-#   12| [RegExpNormalChar] 7}
-
 #   15| [RegExpConstant, RegExpNormalChar] foo
 
 #   15| [RegExpAlt] foo|bar
@@ -180,313 +172,318 @@ regexp.rb:
 
 #   26| [RegExpConstant, RegExpNormalChar] -
 
-#   29| [RegExpCharacterClass] [[a-f]
+#   27| [RegExpCharacterClass] [|]
+#-----| 0 -> [RegExpConstant, RegExpNormalChar] |
+
+#   27| [RegExpConstant, RegExpNormalChar] |
+
+#   30| [RegExpCharacterClass] [[a-f]
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] [
 #-----| 1 -> [RegExpCharacterRange] a-f
 
-#   29| [RegExpSequence] [[a-f]A-F]
+#   30| [RegExpSequence] [[a-f]A-F]
 #-----| 0 -> [RegExpCharacterClass] [[a-f]
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] A-F]
 
-#   29| [RegExpConstant, RegExpNormalChar] [
+#   30| [RegExpConstant, RegExpNormalChar] [
 
-#   29| [RegExpConstant, RegExpNormalChar] a
+#   30| [RegExpConstant, RegExpNormalChar] a
 
-#   29| [RegExpCharacterRange] a-f
+#   30| [RegExpCharacterRange] a-f
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] f
 
-#   29| [RegExpConstant, RegExpNormalChar] f
+#   30| [RegExpConstant, RegExpNormalChar] f
 
-#   29| [RegExpConstant, RegExpNormalChar] A-F]
-
-#   32| [RegExpDot] .
-
-#   32| [RegExpStar] .*
-#-----| 0 -> [RegExpDot] .
+#   30| [RegExpConstant, RegExpNormalChar] A-F]
 
 #   33| [RegExpDot] .
 
 #   33| [RegExpStar] .*
 #-----| 0 -> [RegExpDot] .
 
-#   34| [RegExpCharacterClassEscape] \w
+#   34| [RegExpDot] .
 
-#   34| [RegExpPlus] \w+
+#   34| [RegExpStar] .*
+#-----| 0 -> [RegExpDot] .
+
+#   35| [RegExpCharacterClassEscape] \w
+
+#   35| [RegExpPlus] \w+
 #-----| 0 -> [RegExpCharacterClassEscape] \w
 
-#   34| [RegExpSequence] \w+\W
+#   35| [RegExpSequence] \w+\W
 #-----| 0 -> [RegExpPlus] \w+
 #-----| 1 -> [RegExpCharacterClassEscape] \W
 
-#   34| [RegExpCharacterClassEscape] \W
+#   35| [RegExpCharacterClassEscape] \W
 
-#   35| [RegExpCharacterClassEscape] \s
+#   36| [RegExpCharacterClassEscape] \s
 
-#   35| [RegExpSequence] \s\S
+#   36| [RegExpSequence] \s\S
 #-----| 0 -> [RegExpCharacterClassEscape] \s
 #-----| 1 -> [RegExpCharacterClassEscape] \S
 
-#   35| [RegExpCharacterClassEscape] \S
+#   36| [RegExpCharacterClassEscape] \S
 
-#   36| [RegExpCharacterClassEscape] \d
+#   37| [RegExpCharacterClassEscape] \d
 
-#   36| [RegExpSequence] \d\D
+#   37| [RegExpSequence] \d\D
 #-----| 0 -> [RegExpCharacterClassEscape] \d
 #-----| 1 -> [RegExpCharacterClassEscape] \D
 
-#   36| [RegExpCharacterClassEscape] \D
+#   37| [RegExpCharacterClassEscape] \D
 
-#   37| [RegExpCharacterClassEscape] \h
+#   38| [RegExpCharacterClassEscape] \h
 
-#   37| [RegExpSequence] \h\H
+#   38| [RegExpSequence] \h\H
 #-----| 0 -> [RegExpCharacterClassEscape] \h
 #-----| 1 -> [RegExpCharacterClassEscape] \H
 
-#   37| [RegExpCharacterClassEscape] \H
+#   38| [RegExpCharacterClassEscape] \H
 
-#   38| [RegExpConstant, RegExpEscape] \n
+#   39| [RegExpConstant, RegExpEscape] \n
 
-#   38| [RegExpSequence] \n\r\t
+#   39| [RegExpSequence] \n\r\t
 #-----| 0 -> [RegExpConstant, RegExpEscape] \n
 #-----| 1 -> [RegExpConstant, RegExpEscape] \r
 #-----| 2 -> [RegExpConstant, RegExpEscape] \t
 
-#   38| [RegExpConstant, RegExpEscape] \r
+#   39| [RegExpConstant, RegExpEscape] \r
 
-#   38| [RegExpConstant, RegExpEscape] \t
+#   39| [RegExpConstant, RegExpEscape] \t
 
-#   41| [RegExpSpecialChar] \G
+#   42| [RegExpSpecialChar] \G
 
-#   41| [RegExpSequence] \Gabc
+#   42| [RegExpSequence] \Gabc
 #-----| 0 -> [RegExpSpecialChar] \G
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] abc
 
-#   41| [RegExpConstant, RegExpNormalChar] abc
+#   42| [RegExpConstant, RegExpNormalChar] abc
 
-#   42| [RegExpSpecialChar] \b
+#   43| [RegExpSpecialChar] \b
 
-#   42| [RegExpSequence] \b!a\B
+#   43| [RegExpSequence] \b!a\B
 #-----| 0 -> [RegExpSpecialChar] \b
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] !a
 #-----| 2 -> [RegExpSpecialChar] \B
 
-#   42| [RegExpConstant, RegExpNormalChar] !a
+#   43| [RegExpConstant, RegExpNormalChar] !a
 
-#   42| [RegExpSpecialChar] \B
+#   43| [RegExpSpecialChar] \B
 
-#   45| [RegExpGroup] (foo)
+#   46| [RegExpGroup] (foo)
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] foo
 
-#   45| [RegExpStar] (foo)*
+#   46| [RegExpStar] (foo)*
 #-----| 0 -> [RegExpGroup] (foo)
 
-#   45| [RegExpSequence] (foo)*bar
+#   46| [RegExpSequence] (foo)*bar
 #-----| 0 -> [RegExpStar] (foo)*
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] bar
 
-#   45| [RegExpConstant, RegExpNormalChar] foo
+#   46| [RegExpConstant, RegExpNormalChar] foo
 
-#   45| [RegExpConstant, RegExpNormalChar] bar
+#   46| [RegExpConstant, RegExpNormalChar] bar
 
-#   46| [RegExpConstant, RegExpNormalChar] fo
+#   47| [RegExpConstant, RegExpNormalChar] fo
 
-#   46| [RegExpSequence] fo(o|b)ar
+#   47| [RegExpSequence] fo(o|b)ar
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] fo
 #-----| 1 -> [RegExpGroup] (o|b)
 #-----| 2 -> [RegExpConstant, RegExpNormalChar] ar
 
-#   46| [RegExpGroup] (o|b)
+#   47| [RegExpGroup] (o|b)
 #-----| 0 -> [RegExpAlt] o|b
 
-#   46| [RegExpConstant, RegExpNormalChar] o
+#   47| [RegExpConstant, RegExpNormalChar] o
 
-#   46| [RegExpAlt] o|b
+#   47| [RegExpAlt] o|b
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] o
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] b
 
-#   46| [RegExpConstant, RegExpNormalChar] b
+#   47| [RegExpConstant, RegExpNormalChar] b
 
-#   46| [RegExpConstant, RegExpNormalChar] ar
+#   47| [RegExpConstant, RegExpNormalChar] ar
 
-#   47| [RegExpGroup] (a|b|cd)
+#   48| [RegExpGroup] (a|b|cd)
 #-----| 0 -> [RegExpAlt] a|b|cd
 
-#   47| [RegExpSequence] (a|b|cd)e
+#   48| [RegExpSequence] (a|b|cd)e
 #-----| 0 -> [RegExpGroup] (a|b|cd)
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] e
 
-#   47| [RegExpConstant, RegExpNormalChar] a
+#   48| [RegExpConstant, RegExpNormalChar] a
 
-#   47| [RegExpAlt] a|b|cd
+#   48| [RegExpAlt] a|b|cd
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] b
 #-----| 2 -> [RegExpConstant, RegExpNormalChar] cd
 
-#   47| [RegExpConstant, RegExpNormalChar] b
+#   48| [RegExpConstant, RegExpNormalChar] b
 
-#   47| [RegExpConstant, RegExpNormalChar] cd
+#   48| [RegExpConstant, RegExpNormalChar] cd
 
-#   47| [RegExpConstant, RegExpNormalChar] e
+#   48| [RegExpConstant, RegExpNormalChar] e
 
-#   48| [RegExpGroup] (?::+)
+#   49| [RegExpGroup] (?::+)
 #-----| 0 -> [RegExpPlus] :+
 
-#   48| [RegExpSequence] (?::+)\w
+#   49| [RegExpSequence] (?::+)\w
 #-----| 0 -> [RegExpGroup] (?::+)
 #-----| 1 -> [RegExpCharacterClassEscape] \w
 
-#   48| [RegExpConstant, RegExpNormalChar] :
+#   49| [RegExpConstant, RegExpNormalChar] :
 
-#   48| [RegExpPlus] :+
+#   49| [RegExpPlus] :+
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] :
 
-#   48| [RegExpCharacterClassEscape] \w
+#   49| [RegExpCharacterClassEscape] \w
 
-#   51| [RegExpGroup] (?<id>\w+)
+#   52| [RegExpGroup] (?<id>\w+)
 #-----| 0 -> [RegExpPlus] \w+
 
-#   51| [RegExpCharacterClassEscape] \w
+#   52| [RegExpCharacterClassEscape] \w
 
-#   51| [RegExpPlus] \w+
+#   52| [RegExpPlus] \w+
 #-----| 0 -> [RegExpCharacterClassEscape] \w
 
-#   52| [RegExpGroup] (?'foo'fo+)
+#   53| [RegExpGroup] (?'foo'fo+)
 #-----| 0 -> [RegExpSequence] fo+
 
-#   52| [RegExpConstant, RegExpNormalChar] f
+#   53| [RegExpConstant, RegExpNormalChar] f
 
-#   52| [RegExpSequence] fo+
+#   53| [RegExpSequence] fo+
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] f
 #-----| 1 -> [RegExpPlus] o+
 
-#   52| [RegExpConstant, RegExpNormalChar] o
+#   53| [RegExpConstant, RegExpNormalChar] o
 
-#   52| [RegExpPlus] o+
+#   53| [RegExpPlus] o+
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] o
 
-#   55| [RegExpGroup] (a+)
+#   56| [RegExpGroup] (a+)
 #-----| 0 -> [RegExpPlus] a+
 
-#   55| [RegExpSequence] (a+)b+\1
+#   56| [RegExpSequence] (a+)b+\1
 #-----| 0 -> [RegExpGroup] (a+)
 #-----| 1 -> [RegExpPlus] b+
 #-----| 2 -> [RegExpBackRef] \1
 
-#   55| [RegExpConstant, RegExpNormalChar] a
+#   56| [RegExpConstant, RegExpNormalChar] a
 
-#   55| [RegExpPlus] a+
+#   56| [RegExpPlus] a+
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 
-#   55| [RegExpConstant, RegExpNormalChar] b
+#   56| [RegExpConstant, RegExpNormalChar] b
 
-#   55| [RegExpPlus] b+
+#   56| [RegExpPlus] b+
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] b
 
-#   55| [RegExpBackRef] \1
+#   56| [RegExpBackRef] \1
 
-#   56| [RegExpGroup] (?<qux>q+)
+#   57| [RegExpGroup] (?<qux>q+)
 #-----| 0 -> [RegExpPlus] q+
 
-#   56| [RegExpSequence] (?<qux>q+)\s+\k<qux>+
+#   57| [RegExpSequence] (?<qux>q+)\s+\k<qux>+
 #-----| 0 -> [RegExpGroup] (?<qux>q+)
 #-----| 1 -> [RegExpPlus] \s+
 #-----| 2 -> [RegExpPlus] \k<qux>+
 
-#   56| [RegExpConstant, RegExpNormalChar] q
+#   57| [RegExpConstant, RegExpNormalChar] q
 
-#   56| [RegExpPlus] q+
+#   57| [RegExpPlus] q+
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] q
 
-#   56| [RegExpCharacterClassEscape] \s
+#   57| [RegExpCharacterClassEscape] \s
 
-#   56| [RegExpPlus] \s+
+#   57| [RegExpPlus] \s+
 #-----| 0 -> [RegExpCharacterClassEscape] \s
 
-#   56| [RegExpBackRef] \k<qux>
+#   57| [RegExpBackRef] \k<qux>
 
-#   56| [RegExpPlus] \k<qux>+
+#   57| [RegExpPlus] \k<qux>+
 #-----| 0 -> [RegExpBackRef] \k<qux>
 
-#   59| [RegExpNamedCharacterProperty] \p{Word}
+#   60| [RegExpNamedCharacterProperty] \p{Word}
 
-#   59| [RegExpStar] \p{Word}*
+#   60| [RegExpStar] \p{Word}*
 #-----| 0 -> [RegExpNamedCharacterProperty] \p{Word}
 
-#   60| [RegExpNamedCharacterProperty] \P{Digit}
+#   61| [RegExpNamedCharacterProperty] \P{Digit}
 
-#   60| [RegExpPlus] \P{Digit}+
+#   61| [RegExpPlus] \P{Digit}+
 #-----| 0 -> [RegExpNamedCharacterProperty] \P{Digit}
 
-#   61| [RegExpNamedCharacterProperty] \p{^Alnum}
+#   62| [RegExpNamedCharacterProperty] \p{^Alnum}
 
-#   61| [RegExpRange] \p{^Alnum}{2,3}
+#   62| [RegExpRange] \p{^Alnum}{2,3}
 #-----| 0 -> [RegExpNamedCharacterProperty] \p{^Alnum}
 
-#   61| [RegExpNormalChar] 2,3}
-
-#   62| [RegExpCharacterClass] [a-f\p{Digit}]
+#   63| [RegExpCharacterClass] [a-f\p{Digit}]
 #-----| 0 -> [RegExpCharacterRange] a-f
 #-----| 1 -> [RegExpNamedCharacterProperty] \p{Digit}
 
-#   62| [RegExpPlus] [a-f\p{Digit}]+
+#   63| [RegExpPlus] [a-f\p{Digit}]+
 #-----| 0 -> [RegExpCharacterClass] [a-f\p{Digit}]
 
-#   62| [RegExpConstant, RegExpNormalChar] a
+#   63| [RegExpConstant, RegExpNormalChar] a
 
-#   62| [RegExpCharacterRange] a-f
+#   63| [RegExpCharacterRange] a-f
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] f
 
-#   62| [RegExpConstant, RegExpNormalChar] f
+#   63| [RegExpConstant, RegExpNormalChar] f
 
-#   62| [RegExpNamedCharacterProperty] \p{Digit}
+#   63| [RegExpNamedCharacterProperty] \p{Digit}
 
-#   65| [RegExpCharacterClass] [[:alpha:]]
+#   66| [RegExpCharacterClass] [[:alpha:]]
 #-----| 0 -> [RegExpNamedCharacterProperty] [:alpha:]
 
-#   65| [RegExpSequence] [[:alpha:]][[:digit:]]
+#   66| [RegExpSequence] [[:alpha:]][[:digit:]]
 #-----| 0 -> [RegExpCharacterClass] [[:alpha:]]
 #-----| 1 -> [RegExpCharacterClass] [[:digit:]]
 
-#   65| [RegExpNamedCharacterProperty] [:alpha:]
+#   66| [RegExpNamedCharacterProperty] [:alpha:]
 
-#   65| [RegExpCharacterClass] [[:digit:]]
+#   66| [RegExpCharacterClass] [[:digit:]]
 #-----| 0 -> [RegExpNamedCharacterProperty] [:digit:]
 
-#   65| [RegExpNamedCharacterProperty] [:digit:]
+#   66| [RegExpNamedCharacterProperty] [:digit:]
 
-#   68| [RegExpCharacterClass] [[:alpha:][:digit:]]
+#   69| [RegExpCharacterClass] [[:alpha:][:digit:]]
 #-----| 0 -> [RegExpNamedCharacterProperty] [:alpha:]
 #-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
 
-#   68| [RegExpNamedCharacterProperty] [:alpha:]
+#   69| [RegExpNamedCharacterProperty] [:alpha:]
 
-#   68| [RegExpNamedCharacterProperty] [:digit:]
+#   69| [RegExpNamedCharacterProperty] [:digit:]
 
-#   71| [RegExpCharacterClass] [A-F[:digit:]a-f]
+#   72| [RegExpCharacterClass] [A-F[:digit:]a-f]
 #-----| 0 -> [RegExpCharacterRange] A-F
 #-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
 #-----| 2 -> [RegExpCharacterRange] a-f
 
-#   71| [RegExpConstant, RegExpNormalChar] A
+#   72| [RegExpConstant, RegExpNormalChar] A
 
-#   71| [RegExpCharacterRange] A-F
+#   72| [RegExpCharacterRange] A-F
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] A
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] F
 
-#   71| [RegExpConstant, RegExpNormalChar] F
+#   72| [RegExpConstant, RegExpNormalChar] F
 
-#   71| [RegExpNamedCharacterProperty] [:digit:]
+#   72| [RegExpNamedCharacterProperty] [:digit:]
 
-#   71| [RegExpConstant, RegExpNormalChar] a
+#   72| [RegExpConstant, RegExpNormalChar] a
 
-#   71| [RegExpCharacterRange] a-f
+#   72| [RegExpCharacterRange] a-f
 #-----| 0 -> [RegExpConstant, RegExpNormalChar] a
 #-----| 1 -> [RegExpConstant, RegExpNormalChar] f
 
-#   71| [RegExpConstant, RegExpNormalChar] f
+#   72| [RegExpConstant, RegExpNormalChar] f
 
-#   74| [RegExpNamedCharacterProperty] [:digit:]
+#   75| [RegExpNamedCharacterProperty] [:digit:]
 
-#   78| [RegExpConstant, RegExpNormalChar] abc
+#   79| [RegExpConstant, RegExpNormalChar] abc
+
+#   82| [RegExpConstant, RegExpEscape] \u{987
diff --git a/ruby/ql/test/library-tests/regexp/regexp.expected b/ruby/ql/test/library-tests/regexp/regexp.expected
new file mode 100644
index 00000000000..35c85b0132f
--- /dev/null
+++ b/ruby/ql/test/library-tests/regexp/regexp.expected
@@ -0,0 +1,273 @@
+groupName
+| regexp.rb:52:2:52:11 | (?<id>\\w+) | id |
+| regexp.rb:53:2:53:12 | (?'foo'fo+) | foo |
+| regexp.rb:57:2:57:11 | (?<qux>q+) | qux |
+groupNumber
+| regexp.rb:46:2:46:6 | (foo) | 1 |
+| regexp.rb:47:4:47:8 | (o\|b) | 1 |
+| regexp.rb:48:2:48:9 | (a\|b\|cd) | 1 |
+| regexp.rb:49:2:49:7 | (?::+) | 1 |
+| regexp.rb:52:2:52:11 | (?<id>\\w+) | 1 |
+| regexp.rb:53:2:53:12 | (?'foo'fo+) | 1 |
+| regexp.rb:56:2:56:5 | (a+) | 1 |
+| regexp.rb:57:2:57:11 | (?<qux>q+) | 1 |
+term
+| regexp.rb:5:2:5:4 | abc | RegExpConstant,RegExpNormalChar |
+| regexp.rb:8:2:8:2 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:8:2:8:3 | a* | RegExpStar |
+| regexp.rb:8:2:8:8 | a*b+c?d | RegExpSequence |
+| regexp.rb:8:4:8:4 | b | RegExpConstant,RegExpNormalChar |
+| regexp.rb:8:4:8:5 | b+ | RegExpPlus |
+| regexp.rb:8:6:8:6 | c | RegExpConstant,RegExpNormalChar |
+| regexp.rb:8:6:8:7 | c? | RegExpOpt |
+| regexp.rb:8:8:8:8 | d | RegExpConstant,RegExpNormalChar |
+| regexp.rb:9:2:9:2 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:9:2:9:7 | a{4,8} | RegExpRange |
+| regexp.rb:10:2:10:2 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:10:2:10:6 | a{,8} | RegExpRange |
+| regexp.rb:11:2:11:2 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:11:2:11:6 | a{3,} | InfiniteRepetitionQuantifier,RegExpRange |
+| regexp.rb:12:2:12:2 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:12:2:12:5 | a{7} | RegExpRange |
+| regexp.rb:15:2:15:4 | foo | RegExpConstant,RegExpNormalChar |
+| regexp.rb:15:2:15:8 | foo\|bar | RegExpAlt |
+| regexp.rb:15:6:15:8 | bar | RegExpConstant,RegExpNormalChar |
+| regexp.rb:18:2:18:6 | [abc] | RegExpCharacterClass |
+| regexp.rb:18:3:18:3 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:18:4:18:4 | b | RegExpConstant,RegExpNormalChar |
+| regexp.rb:18:5:18:5 | c | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:2:19:13 | [a-fA-F0-9_] | RegExpCharacterClass |
+| regexp.rb:19:3:19:3 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:3:19:5 | a-f | RegExpCharacterRange |
+| regexp.rb:19:5:19:5 | f | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:6:19:6 | A | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:6:19:8 | A-F | RegExpCharacterRange |
+| regexp.rb:19:8:19:8 | F | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:9:19:9 | 0 | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:9:19:11 | 0-9 | RegExpCharacterRange |
+| regexp.rb:19:11:19:11 | 9 | RegExpConstant,RegExpNormalChar |
+| regexp.rb:19:12:19:12 | _ | RegExpConstant,RegExpNormalChar |
+| regexp.rb:20:2:20:3 | \\A | RegExpCaret |
+| regexp.rb:20:2:20:11 | \\A[+-]?\\d+ | RegExpSequence |
+| regexp.rb:20:4:20:7 | [+-] | RegExpCharacterClass |
+| regexp.rb:20:4:20:8 | [+-]? | RegExpOpt |
+| regexp.rb:20:5:20:5 | + | RegExpConstant,RegExpNormalChar |
+| regexp.rb:20:6:20:6 | - | RegExpConstant,RegExpNormalChar |
+| regexp.rb:20:9:20:10 | \\d | RegExpCharacterClassEscape |
+| regexp.rb:20:9:20:11 | \\d+ | RegExpPlus |
+| regexp.rb:21:2:21:5 | [\\w] | RegExpCharacterClass |
+| regexp.rb:21:2:21:6 | [\\w]+ | RegExpPlus |
+| regexp.rb:21:3:21:4 | \\w | RegExpCharacterClassEscape |
+| regexp.rb:22:2:22:3 | \\[ | RegExpConstant,RegExpEscape |
+| regexp.rb:22:2:22:10 | \\[\\][123] | RegExpSequence |
+| regexp.rb:22:4:22:5 | \\] | RegExpConstant,RegExpEscape |
+| regexp.rb:22:6:22:10 | [123] | RegExpCharacterClass |
+| regexp.rb:22:7:22:7 | 1 | RegExpConstant,RegExpNormalChar |
+| regexp.rb:22:8:22:8 | 2 | RegExpConstant,RegExpNormalChar |
+| regexp.rb:22:9:22:9 | 3 | RegExpConstant,RegExpNormalChar |
+| regexp.rb:23:2:23:7 | [^A-Z] | RegExpCharacterClass |
+| regexp.rb:23:4:23:4 | A | RegExpConstant,RegExpNormalChar |
+| regexp.rb:23:4:23:6 | A-Z | RegExpCharacterRange |
+| regexp.rb:23:6:23:6 | Z | RegExpConstant,RegExpNormalChar |
+| regexp.rb:24:2:24:4 | []] | RegExpCharacterClass |
+| regexp.rb:24:3:24:3 | ] | RegExpConstant,RegExpNormalChar |
+| regexp.rb:25:2:25:5 | [^]] | RegExpCharacterClass |
+| regexp.rb:25:4:25:4 | ] | RegExpConstant,RegExpNormalChar |
+| regexp.rb:26:2:26:5 | [^-] | RegExpCharacterClass |
+| regexp.rb:26:4:26:4 | - | RegExpConstant,RegExpNormalChar |
+| regexp.rb:27:2:27:4 | [\|] | RegExpCharacterClass |
+| regexp.rb:27:3:27:3 | \| | RegExpConstant,RegExpNormalChar |
+| regexp.rb:30:2:30:7 | [[a-f] | RegExpCharacterClass |
+| regexp.rb:30:2:30:11 | [[a-f]A-F] | RegExpSequence |
+| regexp.rb:30:3:30:3 | [ | RegExpConstant,RegExpNormalChar |
+| regexp.rb:30:4:30:4 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:30:4:30:6 | a-f | RegExpCharacterRange |
+| regexp.rb:30:6:30:6 | f | RegExpConstant,RegExpNormalChar |
+| regexp.rb:30:8:30:11 | A-F] | RegExpConstant,RegExpNormalChar |
+| regexp.rb:33:2:33:2 | . | RegExpDot |
+| regexp.rb:33:2:33:3 | .* | RegExpStar |
+| regexp.rb:34:2:34:2 | . | RegExpDot |
+| regexp.rb:34:2:34:3 | .* | RegExpStar |
+| regexp.rb:35:2:35:3 | \\w | RegExpCharacterClassEscape |
+| regexp.rb:35:2:35:4 | \\w+ | RegExpPlus |
+| regexp.rb:35:2:35:6 | \\w+\\W | RegExpSequence |
+| regexp.rb:35:5:35:6 | \\W | RegExpCharacterClassEscape |
+| regexp.rb:36:2:36:3 | \\s | RegExpCharacterClassEscape |
+| regexp.rb:36:2:36:5 | \\s\\S | RegExpSequence |
+| regexp.rb:36:4:36:5 | \\S | RegExpCharacterClassEscape |
+| regexp.rb:37:2:37:3 | \\d | RegExpCharacterClassEscape |
+| regexp.rb:37:2:37:5 | \\d\\D | RegExpSequence |
+| regexp.rb:37:4:37:5 | \\D | RegExpCharacterClassEscape |
+| regexp.rb:38:2:38:3 | \\h | RegExpCharacterClassEscape |
+| regexp.rb:38:2:38:5 | \\h\\H | RegExpSequence |
+| regexp.rb:38:4:38:5 | \\H | RegExpCharacterClassEscape |
+| regexp.rb:39:2:39:3 | \\n | RegExpConstant,RegExpEscape |
+| regexp.rb:39:2:39:7 | \\n\\r\\t | RegExpSequence |
+| regexp.rb:39:4:39:5 | \\r | RegExpConstant,RegExpEscape |
+| regexp.rb:39:6:39:7 | \\t | RegExpConstant,RegExpEscape |
+| regexp.rb:42:2:42:3 | \\G | RegExpSpecialChar |
+| regexp.rb:42:2:42:6 | \\Gabc | RegExpSequence |
+| regexp.rb:42:4:42:6 | abc | RegExpConstant,RegExpNormalChar |
+| regexp.rb:43:2:43:3 | \\b | RegExpSpecialChar |
+| regexp.rb:43:2:43:7 | \\b!a\\B | RegExpSequence |
+| regexp.rb:43:4:43:5 | !a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:43:6:43:7 | \\B | RegExpSpecialChar |
+| regexp.rb:46:2:46:6 | (foo) | RegExpGroup |
+| regexp.rb:46:2:46:7 | (foo)* | RegExpStar |
+| regexp.rb:46:2:46:10 | (foo)*bar | RegExpSequence |
+| regexp.rb:46:3:46:5 | foo | RegExpConstant,RegExpNormalChar |
+| regexp.rb:46:8:46:10 | bar | RegExpConstant,RegExpNormalChar |
+| regexp.rb:47:2:47:3 | fo | RegExpConstant,RegExpNormalChar |
+| regexp.rb:47:2:47:10 | fo(o\|b)ar | RegExpSequence |
+| regexp.rb:47:4:47:8 | (o\|b) | RegExpGroup |
+| regexp.rb:47:5:47:5 | o | RegExpConstant,RegExpNormalChar |
+| regexp.rb:47:5:47:7 | o\|b | RegExpAlt |
+| regexp.rb:47:7:47:7 | b | RegExpConstant,RegExpNormalChar |
+| regexp.rb:47:9:47:10 | ar | RegExpConstant,RegExpNormalChar |
+| regexp.rb:48:2:48:9 | (a\|b\|cd) | RegExpGroup |
+| regexp.rb:48:2:48:10 | (a\|b\|cd)e | RegExpSequence |
+| regexp.rb:48:3:48:3 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:48:3:48:8 | a\|b\|cd | RegExpAlt |
+| regexp.rb:48:5:48:5 | b | RegExpConstant,RegExpNormalChar |
+| regexp.rb:48:7:48:8 | cd | RegExpConstant,RegExpNormalChar |
+| regexp.rb:48:10:48:10 | e | RegExpConstant,RegExpNormalChar |
+| regexp.rb:49:2:49:7 | (?::+) | RegExpGroup |
+| regexp.rb:49:2:49:9 | (?::+)\\w | RegExpSequence |
+| regexp.rb:49:5:49:5 | : | RegExpConstant,RegExpNormalChar |
+| regexp.rb:49:5:49:6 | :+ | RegExpPlus |
+| regexp.rb:49:8:49:9 | \\w | RegExpCharacterClassEscape |
+| regexp.rb:52:2:52:11 | (?<id>\\w+) | RegExpGroup |
+| regexp.rb:52:8:52:9 | \\w | RegExpCharacterClassEscape |
+| regexp.rb:52:8:52:10 | \\w+ | RegExpPlus |
+| regexp.rb:53:2:53:12 | (?'foo'fo+) | RegExpGroup |
+| regexp.rb:53:9:53:9 | f | RegExpConstant,RegExpNormalChar |
+| regexp.rb:53:9:53:11 | fo+ | RegExpSequence |
+| regexp.rb:53:10:53:10 | o | RegExpConstant,RegExpNormalChar |
+| regexp.rb:53:10:53:11 | o+ | RegExpPlus |
+| regexp.rb:56:2:56:5 | (a+) | RegExpGroup |
+| regexp.rb:56:2:56:9 | (a+)b+\\1 | RegExpSequence |
+| regexp.rb:56:3:56:3 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:56:3:56:4 | a+ | RegExpPlus |
+| regexp.rb:56:6:56:6 | b | RegExpConstant,RegExpNormalChar |
+| regexp.rb:56:6:56:7 | b+ | RegExpPlus |
+| regexp.rb:56:8:56:9 | \\1 | RegExpBackRef |
+| regexp.rb:57:2:57:11 | (?<qux>q+) | RegExpGroup |
+| regexp.rb:57:2:57:22 | (?<qux>q+)\\s+\\k<qux>+ | RegExpSequence |
+| regexp.rb:57:9:57:9 | q | RegExpConstant,RegExpNormalChar |
+| regexp.rb:57:9:57:10 | q+ | RegExpPlus |
+| regexp.rb:57:12:57:13 | \\s | RegExpCharacterClassEscape |
+| regexp.rb:57:12:57:14 | \\s+ | RegExpPlus |
+| regexp.rb:57:15:57:21 | \\k<qux> | RegExpBackRef |
+| regexp.rb:57:15:57:22 | \\k<qux>+ | RegExpPlus |
+| regexp.rb:60:2:60:9 | \\p{Word} | RegExpNamedCharacterProperty |
+| regexp.rb:60:2:60:10 | \\p{Word}* | RegExpStar |
+| regexp.rb:61:2:61:10 | \\P{Digit} | RegExpNamedCharacterProperty |
+| regexp.rb:61:2:61:11 | \\P{Digit}+ | RegExpPlus |
+| regexp.rb:62:2:62:11 | \\p{^Alnum} | RegExpNamedCharacterProperty |
+| regexp.rb:62:2:62:16 | \\p{^Alnum}{2,3} | RegExpRange |
+| regexp.rb:63:2:63:15 | [a-f\\p{Digit}] | RegExpCharacterClass |
+| regexp.rb:63:2:63:16 | [a-f\\p{Digit}]+ | RegExpPlus |
+| regexp.rb:63:3:63:3 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:63:3:63:5 | a-f | RegExpCharacterRange |
+| regexp.rb:63:5:63:5 | f | RegExpConstant,RegExpNormalChar |
+| regexp.rb:63:6:63:14 | \\p{Digit} | RegExpNamedCharacterProperty |
+| regexp.rb:66:2:66:12 | [[:alpha:]] | RegExpCharacterClass |
+| regexp.rb:66:2:66:23 | [[:alpha:]][[:digit:]] | RegExpSequence |
+| regexp.rb:66:3:66:11 | [:alpha:] | RegExpNamedCharacterProperty |
+| regexp.rb:66:13:66:23 | [[:digit:]] | RegExpCharacterClass |
+| regexp.rb:66:14:66:22 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.rb:69:2:69:21 | [[:alpha:][:digit:]] | RegExpCharacterClass |
+| regexp.rb:69:3:69:11 | [:alpha:] | RegExpNamedCharacterProperty |
+| regexp.rb:69:12:69:20 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.rb:72:2:72:18 | [A-F[:digit:]a-f] | RegExpCharacterClass |
+| regexp.rb:72:3:72:3 | A | RegExpConstant,RegExpNormalChar |
+| regexp.rb:72:3:72:5 | A-F | RegExpCharacterRange |
+| regexp.rb:72:5:72:5 | F | RegExpConstant,RegExpNormalChar |
+| regexp.rb:72:6:72:14 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.rb:72:15:72:15 | a | RegExpConstant,RegExpNormalChar |
+| regexp.rb:72:15:72:17 | a-f | RegExpCharacterRange |
+| regexp.rb:72:17:72:17 | f | RegExpConstant,RegExpNormalChar |
+| regexp.rb:75:2:75:10 | [:digit:] | RegExpNamedCharacterProperty |
+| regexp.rb:79:2:79:4 | abc | RegExpConstant,RegExpNormalChar |
+| regexp.rb:82:2:82:7 | \\u{987 | RegExpConstant,RegExpEscape |
+regExpNormalCharValue
+| regexp.rb:5:2:5:4 | abc | abc |
+| regexp.rb:8:2:8:2 | a | a |
+| regexp.rb:8:4:8:4 | b | b |
+| regexp.rb:8:6:8:6 | c | c |
+| regexp.rb:8:8:8:8 | d | d |
+| regexp.rb:9:2:9:2 | a | a |
+| regexp.rb:10:2:10:2 | a | a |
+| regexp.rb:11:2:11:2 | a | a |
+| regexp.rb:12:2:12:2 | a | a |
+| regexp.rb:15:2:15:4 | foo | foo |
+| regexp.rb:15:6:15:8 | bar | bar |
+| regexp.rb:18:3:18:3 | a | a |
+| regexp.rb:18:4:18:4 | b | b |
+| regexp.rb:18:5:18:5 | c | c |
+| regexp.rb:19:3:19:3 | a | a |
+| regexp.rb:19:5:19:5 | f | f |
+| regexp.rb:19:6:19:6 | A | A |
+| regexp.rb:19:8:19:8 | F | F |
+| regexp.rb:19:9:19:9 | 0 | 0 |
+| regexp.rb:19:11:19:11 | 9 | 9 |
+| regexp.rb:19:12:19:12 | _ | _ |
+| regexp.rb:20:5:20:5 | + | + |
+| regexp.rb:20:6:20:6 | - | - |
+| regexp.rb:20:9:20:10 | \\d | d |
+| regexp.rb:21:3:21:4 | \\w | w |
+| regexp.rb:22:2:22:3 | \\[ | [ |
+| regexp.rb:22:4:22:5 | \\] | ] |
+| regexp.rb:22:7:22:7 | 1 | 1 |
+| regexp.rb:22:8:22:8 | 2 | 2 |
+| regexp.rb:22:9:22:9 | 3 | 3 |
+| regexp.rb:23:4:23:4 | A | A |
+| regexp.rb:23:6:23:6 | Z | Z |
+| regexp.rb:24:3:24:3 | ] | ] |
+| regexp.rb:25:4:25:4 | ] | ] |
+| regexp.rb:26:4:26:4 | - | - |
+| regexp.rb:27:3:27:3 | \| | \| |
+| regexp.rb:30:3:30:3 | [ | [ |
+| regexp.rb:30:4:30:4 | a | a |
+| regexp.rb:30:6:30:6 | f | f |
+| regexp.rb:30:8:30:11 | A-F] | A-F] |
+| regexp.rb:35:2:35:3 | \\w | w |
+| regexp.rb:35:5:35:6 | \\W | W |
+| regexp.rb:36:2:36:3 | \\s | s |
+| regexp.rb:36:4:36:5 | \\S | S |
+| regexp.rb:37:2:37:3 | \\d | d |
+| regexp.rb:37:4:37:5 | \\D | D |
+| regexp.rb:38:2:38:3 | \\h | h |
+| regexp.rb:38:4:38:5 | \\H | H |
+| regexp.rb:39:2:39:3 | \\n | \n |
+| regexp.rb:39:4:39:5 | \\r | \r |
+| regexp.rb:39:6:39:7 | \\t | \t |
+| regexp.rb:42:4:42:6 | abc | abc |
+| regexp.rb:43:4:43:5 | !a | !a |
+| regexp.rb:46:3:46:5 | foo | foo |
+| regexp.rb:46:8:46:10 | bar | bar |
+| regexp.rb:47:2:47:3 | fo | fo |
+| regexp.rb:47:5:47:5 | o | o |
+| regexp.rb:47:7:47:7 | b | b |
+| regexp.rb:47:9:47:10 | ar | ar |
+| regexp.rb:48:3:48:3 | a | a |
+| regexp.rb:48:5:48:5 | b | b |
+| regexp.rb:48:7:48:8 | cd | cd |
+| regexp.rb:48:10:48:10 | e | e |
+| regexp.rb:49:5:49:5 | : | : |
+| regexp.rb:49:8:49:9 | \\w | w |
+| regexp.rb:52:8:52:9 | \\w | w |
+| regexp.rb:53:9:53:9 | f | f |
+| regexp.rb:53:10:53:10 | o | o |
+| regexp.rb:56:3:56:3 | a | a |
+| regexp.rb:56:6:56:6 | b | b |
+| regexp.rb:57:9:57:9 | q | q |
+| regexp.rb:57:12:57:13 | \\s | s |
+| regexp.rb:63:3:63:3 | a | a |
+| regexp.rb:63:5:63:5 | f | f |
+| regexp.rb:72:3:72:3 | A | A |
+| regexp.rb:72:5:72:5 | F | F |
+| regexp.rb:72:15:72:15 | a | a |
+| regexp.rb:72:17:72:17 | f | f |
+| regexp.rb:79:2:79:4 | abc | abc |
+| regexp.rb:82:2:82:7 | \\u{987 | \u0987 |
diff --git a/ruby/ql/test/library-tests/regexp/regexp.ql b/ruby/ql/test/library-tests/regexp/regexp.ql
new file mode 100644
index 00000000000..f310a65a2f4
--- /dev/null
+++ b/ruby/ql/test/library-tests/regexp/regexp.ql
@@ -0,0 +1,11 @@
+import codeql.ruby.security.performance.RegExpTreeView
+
+query predicate groupName(RegExpGroup g, string name) { name = g.getName() }
+
+query predicate groupNumber(RegExpGroup g, int number) { number = g.getNumber() }
+
+query predicate term(RegExpTerm term, string c) { c = term.getPrimaryQlClasses() }
+
+query predicate regExpNormalCharValue(RegExpNormalChar term, string value) {
+  value = term.getValue()
+}
diff --git a/ruby/ql/test/library-tests/regexp/regexp.rb b/ruby/ql/test/library-tests/regexp/regexp.rb
index 28030b914e5..a68c4878094 100644
--- a/ruby/ql/test/library-tests/regexp/regexp.rb
+++ b/ruby/ql/test/library-tests/regexp/regexp.rb
@@ -24,6 +24,7 @@
 /[]]/  # MRI gives a warning, but accepts this as matching ']'
 /[^]]/ # MRI gives a warning, but accepts this as matching anything except ']'
 /[^-]/
+/[|]/
 
 # Nested character classes
 /[[a-f]A-F]/ # BAD - not parsed correctly
@@ -75,4 +76,7 @@
 
 # Simple constant interpolation
 A = "a"
-/#{A}bc/
\ No newline at end of file
+/#{A}bc/
+
+# unicode
+/\u{9879}/
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/variables/ssa.expected b/ruby/ql/test/library-tests/variables/ssa.expected
index fc170598d96..583c9686b83 100644
--- a/ruby/ql/test/library-tests/variables/ssa.expected
+++ b/ruby/ql/test/library-tests/variables/ssa.expected
@@ -29,12 +29,14 @@ definition
 | nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self |
 | nested_scopes.rb:31:11:31:16 | ... = ... | nested_scopes.rb:31:11:31:11 | a |
 | nested_scopes.rb:40:1:40:18 | ... = ... | nested_scopes.rb:40:1:40:1 | d |
+| parameters.rb:1:1:1:1 | self (parameters.rb) | parameters.rb:1:1:62:1 | self |
 | parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self |
 | parameters.rb:1:14:1:14 | x | parameters.rb:1:14:1:14 | x |
 | parameters.rb:2:4:2:8 | ... = ... | parameters.rb:1:18:1:18 | y |
 | parameters.rb:7:1:13:3 | self (order_pizza) | parameters.rb:7:1:13:3 | self |
 | parameters.rb:7:17:7:22 | client | parameters.rb:7:17:7:22 | client |
 | parameters.rb:7:26:7:31 | pizzas | parameters.rb:7:26:7:31 | pizzas |
+| parameters.rb:15:1:19:3 | self (print_map) | parameters.rb:15:1:19:3 | self |
 | parameters.rb:15:17:15:19 | map | parameters.rb:15:17:15:19 | map |
 | parameters.rb:16:12:18:5 | <captured> | parameters.rb:15:1:19:3 | self |
 | parameters.rb:16:16:16:18 | key | parameters.rb:16:16:16:18 | key |
@@ -110,6 +112,7 @@ definition
 | ssa.rb:26:3:28:5 | <captured> | ssa.rb:25:1:30:3 | self |
 | ssa.rb:26:3:28:5 | __synth__0__1 | ssa.rb:26:3:28:5 | __synth__0__1 |
 | ssa.rb:26:3:28:5 | call to each | ssa.rb:26:7:26:10 | elem |
+| ssa.rb:32:1:36:3 | self (m3) | ssa.rb:32:1:36:3 | self |
 | ssa.rb:33:16:35:5 | <captured> | ssa.rb:32:1:36:3 | self |
 | ssa.rb:33:20:33:20 | x | ssa.rb:33:20:33:20 | x |
 | ssa.rb:38:1:42:3 | self (m4) | ssa.rb:38:1:42:3 | self |
diff --git a/ruby/ql/test/query-tests/security/cwe-1333-exponential-redos/ReDoS.expected b/ruby/ql/test/query-tests/security/cwe-1333-exponential-redos/ReDoS.expected
index 1eb0df2212f..84e528bcbff 100644
--- a/ruby/ql/test/query-tests/security/cwe-1333-exponential-redos/ReDoS.expected
+++ b/ruby/ql/test/query-tests/security/cwe-1333-exponential-redos/ReDoS.expected
@@ -95,4 +95,5 @@
 | tst.rb:375:11:375:27 | ([[:digit:]]\|\\d)+ | This part of the regular expression may cause exponential backtracking on strings starting with 'X' and containing many repetitions of '0'. |
 | tst.rb:378:12:378:18 | (a\|\\w)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
 | tst.rb:379:12:379:18 | (a\|\\w)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.rb:390:66:390:67 | .? | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '00\\\\'. |
+| tst.rb:390:70:390:110 | (?:[a-zA-Z0-9_]\|%[a-fA-F0-9][a-fA-F0-9])+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.rb:390:98:390:108 | [a-fA-F0-9] | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0%0'. |